aboutsummaryrefslogtreecommitdiffstats
path: root/p2p
Commit message (Expand)AuthorAgeFilesLines
* p2p: fix rare deadlock in Stop (#17260)Janoš Guljaš2018-07-301-1/+2
* all: simplify switches (#17267)Oleg Kovalov2018-07-303-9/+4
* Merge pull request #17231 from ethersphere/developViktor Trón2018-07-241-0/+18
|\
| * swarm: network simulation for swarm tests (#769)Janoš Guljaš2018-07-231-0/+18
* | p2p: token is useless in xxxEncHandshake (#17230)Wenbiao Zheng2018-07-231-8/+7
|/
* p2p: correct comments typo (#17184)jkcomment2018-07-181-1/+1
* swarm: integrate OpenTracing; propagate ctx to internal APIs (#17169)Anton Evangelatov2018-07-133-13/+101
* p2p/discover: move bond logic from table to transport (#17048)Felix Lange2018-07-036-245/+147
* swarm: network rewrite mergeethersphere2018-06-226-76/+53
* all: library changes for swarm-network-rewrite (#16898)Elad2018-06-1416-102/+494
* crypto: replace ToECDSAPub with error-checking func UnmarshalPubkey (#16932)Felix Lange2018-06-121-3/+3
* p2p/discv5: add egress/ingress traffic metrics to discv5 udp transport (#16369)Dmitry Shulyak2018-05-292-1/+12
* p2p/enr: updates for discovery v4 compatibility (#16679)Felix Lange2018-05-175-154/+277
* p2p: don't discard reason set by Disconnect (#16559)Guilherme Salgado2018-05-091-0/+1
* p2p/simulations/adapters: fix websocket log line parsing in exec adapter (#16...Ivan Daniluk2018-05-083-23/+75
* p2p: fix some golint warnings (#16577)kiel barry2018-05-0813-291/+292
* p2p: changed if-else blocks to conform with golint (#16660)GagziW2018-05-032-17/+15
* build: enable goimports and varcheck linters (#16446)thomasmodeneis2018-04-188-42/+12
* ecies: drop randomness parameter from `PrivateKey.Decrypt` (#16374)David Huie2018-03-261-2/+2
* p2p: fix doEncHandshake documentation (#16184)JU HYEONG PARK2018-02-271-4/+4
* metrics: pull library and introduce ResettingTimer and InfluxDB reporter (#15...Anton Evangelatov2018-02-231-4/+4
* p2p: remove unused code (#16158)Ivan Daniluk2018-02-232-29/+1
* Merge pull request #15919 from ethersphere/p2p-protocols-prBalint Gabor2018-02-225-0/+1316
|\
| * p2p/protocols: gofmt -w -sFelix Lange2018-02-221-22/+22
| * p2p/testing: check for all expectations in TestExchangesJanos Guljas2018-02-182-57/+200
| * p2p/protocols, p2p/testing: protocol abstraction and testingzelig2018-01-185-0/+1173
* | p2p: don't send DiscReason when using net.Pipe (#16004)Anton Evangelatov2018-02-222-5/+43
* | p2p: when peer is removed remove it also from dial history (#16060)Dmitry Shulyak2018-02-212-0/+57
* | p2p/discover: s/lastPong/bondTime/, update TestUDP_findnodeFelix Lange2018-02-175-25/+26
* | p2p/discover: validate bond against lastpong, not db presencePéter Szilágyi2018-02-161-1/+1
* | all: update license information (#16089)Felix Lange2018-02-141-0/+1
* | p2p/discover: fix out-of-bounds issuePéter Szilágyi2018-02-141-1/+1
* | rpc: dns rebind protection (#15962)Martin Holst Swende2018-02-121-1/+1
* | p2p, p2p/discover: misc connectivity improvements (#16069)Felix Lange2018-02-129-276/+795
* | p2p/discv5: fix multiple discovery issues (#16036)Felföldi Zsolt2018-02-093-27/+37
* | p2p/discv5: fix removeTicketRef cached ticket removal (#15995)Felföldi Zsolt2018-01-311-4/+4
* | p2p/discv5: fix topic register panic at shutdown (#15946)Felföldi Zsolt2018-01-231-1/+1
* | p2p/discv5: logs info about discv5 node info at bind timeMartin Holst Swende2018-01-231-0/+1
* | p2p, p2p/discover, p2p/discv5: implement UDP port sharing (#15200)Felföldi Zsolt2018-01-228-63/+114
|/
* all: update generated code (#15808)Felix Lange2018-01-081-3/+3
* core, p2p/discv5: use time.NewTicker instead of time.Tick (#15747)ferhat elmas2018-01-021-3/+3
* p2p/enr: initial implementation (#15585)Anton Evangelatov2017-12-303-0/+768
* p2p/discv5: fix reg lookup, polish code, use logger (#15737)Péter Szilágyi2017-12-284-142/+139
* p2p/discover: fix leaked goroutine in data expirationferhat elmas2017-12-181-3/+3
* p2p/simulations: fix gosimple nit (#15661)Felix Lange2017-12-131-1/+1
* p2p/simulations: add mocker functionality (#15207)holisticode2017-12-135-2/+480
* all: use gometalinter.v2, fix new gosimple issues (#15650)Zach2017-12-134-15/+14
* p2p, swarm/network/kademlia: use IsZero to check for zero time (#15603)ferhat elmas2017-12-041-1/+1
* p2p/simulations: various stability fixes (#15198)Lewis Marshall2017-12-019-56/+148
* build: enable unconvert linter (#15456)ferhat elmas2017-11-111-1/+1
* p2p/nat: delete port mapping before adding (#15222)Darrel Herbst2017-10-061-0/+1
* p2p: snappy encoding for devp2p (version bump to 5) (#15106)Péter Szilágyi2017-09-262-1/+45
* p2p: add network simulation framework (#14982)Lewis Marshall2017-09-2522-14/+4513
* p2p: change ping ticker to timer (#15071)Martin Holst Swende2017-09-041-1/+2
* discover: Changed Logging from Debug to Info (#14485)Ali Hajimirza2017-05-201-1/+1
* cmd/geth: add --config file flag (#13875)Felix Lange2017-04-124-17/+70
* p2p: if no nodes are connected, attempt dialing bootnodes (#13874)Péter Szilágyi2017-04-113-9/+121
* p2p, p2p/discover, p2p/nat: rework logging using context keysFelix Lange2017-02-2811-151/+171
* all: disable log message colors outside of gethFelix Lange2017-02-271-1/+1
* all: blidly swap out glog to our log15, logs need reworkPéter Szilágyi2017-02-2314-140/+118
* p2p: remove trailing newlines from log messagesPéter Szilágyi2017-02-235-19/+19
* crypto: add btcec fallback for sign/recover without cgo (#3680)Felix Lange2017-02-184-35/+4
* all: fix ineffectual assignments and remove uses of crypto.Sha3Felix Lange2017-01-091-3/+3
* all: fix spelling errorsPéter Szilágyi2017-01-072-2/+2
* logger, pow/dagger, pow/ezp: delete dead codeFelix Lange2017-01-071-12/+0
* all: fix issues reported by honnef.co/go/simple/cmd/gosimpleFelix Lange2017-01-074-10/+4
* all: gofmt -w -sFelix Lange2017-01-0610-38/+38
* p2p/nat: fix a bytes based net.IP comparisonPéter Szilágyi2016-12-151-2/+1
* p2p/discover, p2p/discv5: use flexible comparison for IPsPéter Szilágyi2016-12-154-5/+4
* p2p/discv5: search and lookup improvementZsolt Felfoldi2016-12-082-64/+99
* p2p, p2p/discover, p2p/discv5: add IP network restriction featureFelix Lange2016-11-239-34/+124
* p2p/discover, p2p/discv5: prevent relay of invalid IPs and low portsFelix Lange2016-11-236-28/+56
* p2p/discover, p2p/discv5: use netutil.IsTemporaryErrorFelix Lange2016-11-238-248/+2
* p2p/netutil: new package for network utilitiesFelix Lange2016-11-236-0/+503
* cmd, mobile, node, p2p: surface the discovery V5 bootnodesPéter Szilágyi2016-11-152-13/+13
* mobile: initial wrappers for mobile supportPéter Szilágyi2016-11-142-3/+3
* p2p/discv5: added new bootnodesZsolt Felfoldi2016-11-141-1/+2
* p2p/discv5: fixed bootnode connect issuesZsolt Felfoldi2016-11-144-67/+107
* discv5: fixed state machine lockup bugZsolt Felfoldi2016-11-111-0/+3
* all: update license informationFelix Lange2016-11-098-8/+8
* p2p/discv5: fix build with Go 1.5, delete package testimgFelix Lange2016-11-095-879/+18
* p2p/discv5: added new topic discovery packageZsolt Felfoldi2016-11-0926-0/+7906
* Merge pull request #2914 from fjl/node-coinhabitFelix Lange2016-09-291-5/+1
|\
| * p2p/nat: delay auto discovery until first useFelix Lange2016-09-161-5/+1
* | p2p/nat: fix parameter order for AddMappingken101001472016-09-281-2/+2
|/
* Merge pull request #2740 from Firescar96/removepeerFelix Lange2016-07-293-0/+27
|\
| * node, p2p, internal: Add ability to remove peers via admin interfaceFirescar962016-07-153-0/+27
* | ethdb, p2p/discover: replace "alloted" with "allotted" (#2785)villesundell2016-07-121-1/+1
|/
* node, p2p: move network config out of ServerFelix Lange2016-05-183-23/+33
* p2p/discover: prevent bonding selfFelix Lange2016-05-031-0/+4
* p2p: improve readability of dial task scheduling codeFelix Lange2016-05-032-29/+78
* all: fix go vet warningsFelix Lange2016-04-154-8/+8
* p2p: enable EIP-8 handshake sendingFelix Lange2016-04-041-9/+1
* p2p/nat: fix #2291, NAT discovery did't abort on failurePéter Szilágyi2016-03-141-0/+1
* Merge pull request #2242 from jimenezrick/upstream-cryptoJeffrey Wilcke2016-02-248-19/+19
|\
| * all: Rename crypto.Sha3{,Hash}() to crypto.Keccak256{,Hash}()Ricardo Catalinas Jiménez2016-02-228-19/+19
* | p2p/discover: emphasize warning, add 10 min cooldownPéter Szilágyi2016-02-242-18/+39
* | psp/discovery: NTP sanity check clock drift in case of expirationsPéter Szilágyi2016-02-242-4/+128
|/
* p2p: EIP-8 changesFelix Lange2016-02-194-149/+443
* p2p/discover: EIP-8 changesFelix Lange2016-02-192-1/+122
* p2p/discover: fix Windows-specific issue for larger-than-buffer packetsFelix Lange2016-01-234-7/+124
* p2p/discover: attempt to deflake TestUDP_responseTimeoutsFelix Lange2015-12-181-1/+2
* p2p: resolve incomplete dial targetsFelix Lange2015-12-182-63/+175
* p2p, p2p/discover: track bootstrap state in p2p/discoverFelix Lange2015-12-186-91/+110
* p2p/discover: support incomplete node URLs, add ResolveFelix Lange2015-12-187-54/+158
* p2p: always allow dynamic dials if network not disabledPéter Szilágyi2015-12-031-1/+1
* crypto, crypto/ecies, crypto/secp256k1: libsecp256k1 scalar multGustav Simonsson2015-11-303-3/+5
* node: customizable protocol and service stacksPéter Szilágyi2015-11-274-13/+20
* Merge pull request #1934 from karalabe/polish-protocol-infosJeffrey Wilcke2015-11-043-1/+123
|\
| * eth, p2p, rpc/api: polish protocol info gatheringPéter Szilágyi2015-10-283-1/+123
* | p2p/nat: add docs for discoverFelix Lange2015-10-301-0/+3
* | Godeps: upgrade github.com/huin/goupnp to 90f71cb5Felix Lange2015-10-301-1/+6
|/
* p2p/discover: ignore packet version numbersFelix Lange2015-09-302-5/+0
* p2p/discover: remove unused lastLookup fieldFelix Lange2015-09-301-6/+1
* p2p/discover: fix race involving the seed node iteratorFelix Lange2015-09-305-172/+198
* eth, metrics, p2p: prepare metrics and net packets to eth/62Péter Szilágyi2015-08-211-1/+7
* Merge pull request #1694 from obscuren/hide-fdtrackJeffrey Wilcke2015-08-204-11/+5
|\
| * Revert "fdtrack: temporary hack for tracking file descriptor usage"Jeffrey Wilcke2015-08-204-11/+5
* | p2p/discover: don't attempt to replace nodes that are being replacedFelix Lange2015-08-192-4/+15
* | p2p: continue listening after temporary errorsFelix Lange2015-08-191-6/+25
* | p2p/discover: continue reading after temporary errorsFelix Lange2015-08-191-1/+11
|/
* Merge pull request #1470 from ebuchman/encHandshakeFelix Lange2015-08-131-4/+12
|\
| * p2p: validate recovered ephemeral pubkey against checksum in decodeAuthMsgEthan Buchman2015-07-141-4/+12
* | p2p: fix value of DiscSubprotocolErrorFelix Lange2015-08-121-1/+1
* | p2p/discover: fix UDP reply packet timeout handlingFelix Lange2015-08-112-31/+120
* | p2p/discover: unlock the table during ping replacementFelix Lange2015-08-113-52/+77
* | p2p/nat: disable UPnP test on windowsFelix Lange2015-08-061-0/+5
* | p2p/discover: close Table during testingFelix Lange2015-08-062-4/+8
* | fdtrack: temporary hack for tracking file descriptor usageFelix Lange2015-08-044-5/+11
* | all: fix license headers one more timeFelix Lange2015-07-2426-26/+26
* | all: update license headers to distiguish GPL/LGPLFelix Lange2015-07-2326-104/+104
|/
* all: add some godoc synopsis commentsFelix Lange2015-07-072-1/+2
* all: update license informationFelix Lange2015-07-0726-0/+416
* cmd, core, eth, metrics, p2p: require enabling metricsPéter Szilágyi2015-06-301-5/+5
* p2p: fix local/remote cap/protocol mixupPéter Szilágyi2015-06-271-23/+23
* p2p: support protocol version negotiationPéter Szilágyi2015-06-263-6/+110
* p2p: instrument P2P networking layerPéter Szilágyi2015-06-243-3/+56
* p2p: throttle all discovery lookupsFelix Lange2015-06-222-15/+16
* p2p: improve disconnect loggingFelix Lange2015-06-152-6/+7
* p2p: track write errors and prevent writes during shutdownFelix Lange2015-06-151-25/+57
* p2p/discover: use separate rand.Source instances in testsFelix Lange2015-06-102-15/+19
* p2p/discover: deflake TestUDP_successfulPingFelix Lange2015-06-102-33/+30
* p2p: fix a close race in the dial testPéter Szilágyi2015-06-101-1/+2
* p2p: bump global write timeout to 20sFelix Lange2015-06-091-1/+1
* p2p: fix close data racePéter Szilágyi2015-06-091-0/+1
* p2p/nat: add timeout for UPnP SOAP requestsFelix Lange2015-06-051-0/+3
* p2p/nat: bump timeout in TestAutoDiscRaceFelix Lange2015-05-281-1/+1
* p2p/discover: bond with seed nodes too (runs only if findnode failed)Péter Szilágyi2015-05-271-7/+4
* p2p/discovery: fix a cornercase loop if no seeds or bootnodes are knownPéter Szilágyi2015-05-271-5/+9
* p2p/discover: force refresh if the table is emptyPéter Szilágyi2015-05-271-13/+41
* p2p/discover: permit temporary bond failures for previously known nodesPéter Szilágyi2015-05-271-12/+15
* p2p/discover: watch find failures, evacuate on too many, rebond if failedPéter Szilágyi2015-05-271-8/+47
* p2p/discover: add support for counting findnode failuresPéter Szilágyi2015-05-272-3/+25
* p2p: fix Self() panic if listening is disabledPéter Szilágyi2015-05-271-0/+9
* cmd/geth, cmd/utils, eth, p2p: pass and honor a no discovery flagPéter Szilágyi2015-05-271-8/+29
* eth, p2p: start the p2p server even if maxpeers == 0Péter Szilágyi2015-05-261-3/+0
* p2p: decrease frameReadTimeout to 30sFelix Lange2015-05-251-4/+5
* p2p: new dialer, peer management without locksFelix Lange2015-05-2511-1329/+2118
* p2p/discover: add ReadRandomNodesFelix Lange2015-05-252-1/+83
* p2p: decrease maximum message size for devp2p to 1kBFelix Lange2015-05-251-1/+1
* p2p: delete Server.BroadcastFelix Lange2015-05-254-136/+0
* p2p/discover: fix #838, evacuate self entries from the node dbPéter Szilágyi2015-05-223-25/+99
* p2p/discover: fix database presistency test folderPéter Szilágyi2015-05-221-3/+3
* Merge pull request #971 from fjl/p2p-limit-tweaksJeffrey Wilcke2015-05-147-64/+16
|\
| * p2p/discover: limit open files for node databaseFelix Lange2015-05-141-2/+3
| * p2p: remove testlogFelix Lange2015-05-143-51/+0
| * p2p/discover: bump maxBondingPingPongs to 16Felix Lange2015-05-141-1/+1
| * p2p: log remote reason when disconnect is requestedFelix Lange2015-05-142-8/+10
| * p2p: bump maxAcceptConns and defaultDialTimoutFelix Lange2015-05-141-2/+2
* | p2p/nat: tweak port mapping log messages and levelsFelix Lange2015-05-141-7/+6
* | p2p/nat: add test for UPnP auto discovery via SSDPFelix Lange2015-05-141-0/+223
* | p2p/nat: fix concurrent access to autodisc InterfaceFelix Lange2015-05-142-17/+63
|/
* p2p/discover: fix out-of-bounds slicing for chunked neighbors packetsFelix Lange2015-05-142-32/+49
* fix test.subtly2015-05-141-1/+1
* Manual send of multiple neighbours packets. Test receiving multiple neighbour...subtly2015-05-142-3/+19
* UDP Interop. Limit datagrams to 1280bytes.subtly2015-05-141-1/+1
* removed redundant newlines in import blockBas van Kervel2015-05-121-1/+1
* replaced several path.* with filepath.* which is platform independentBas van Kervel2015-05-121-2/+2
* p2p: drop connections with no matching protocolsFelix Lange2015-05-082-4/+21
* p2p: use maxDialingConns instead of maxAcceptConns as dial limitFelix Lange2015-05-081-1/+1
* p2p: fix disconnect at capacityFelix Lange2015-05-084-33/+46
* p2p: increase the handshake timeout in the testsPéter Szilágyi2015-05-071-2/+2
* cmd, eth, p2p: introduce pending peer cli arg, add testsPéter Szilágyi2015-05-072-7/+148
* p2p: reduce the concurrent handshakes to 10/10 in/outPéter Szilágyi2015-05-071-2/+2
* p2p: fix dial throttling race conditionPéter Szilágyi2015-05-071-1/+1
* p2p: fix a dialing race in the throttlerPéter Szilágyi2015-05-071-1/+1
* p2p: limit the outbound dialing tooPéter Szilágyi2015-05-071-1/+11
* Merge pull request #866 from fjl/p2p-last-minuteJeffrey Wilcke2015-05-074-19/+16
|\
| * p2p: stop dialing at half the maximum peer countFelix Lange2015-05-071-1/+1
| * p2p, whisper: use glog for peer-level loggingFelix Lange2015-05-071-13/+8
| * p2p/discover: bump packet timeouts to 500msFelix Lange2015-05-071-2/+2
| * p2p/nat: less confusing error loggingFelix Lange2015-05-071-3/+5
* | fixed merge issueobscuren2015-05-074-30/+263
|\ \ | |/ |/|
| * eth, p2p: add trusted node list beside static listPéter Szilágyi2015-05-044-39/+47
| * p2p: add static node dialing testPéter Szilágyi2015-05-042-13/+108
| * p2p: correct a leftover trusted -> staticPéter Szilágyi2015-05-011-4/+4
| * eth, p2p: rename trusted nodes to static, drop inbound extra slotsPéter Szilágyi2015-05-014-46/+48
| * cmd, eth, p2p: fix review issues enumerated by FelixPéter Szilágyi2015-04-302-21/+12
| * p2p: add trust check to handshake, test privileged connectivityPéter Szilágyi2015-04-304-15/+88
| * p2p: reduce the severity of a debug logPéter Szilágyi2015-04-301-1/+1
| * cmd/geth, cmd/mist, cmd/utils, eth, p2p: support trusted peersPéter Szilágyi2015-04-302-14/+78
* | p2p/discover: new distance metric based on sha3(id)Felix Lange2015-05-066-106/+354
* | p2p/discover: track sha3(ID) in NodeFelix Lange2015-04-308-99/+166
* | p2p, p2p/discover: protocol version 4Felix Lange2015-04-302-2/+2
* | p2p/discover: new endpoint formatFelix Lange2015-04-3010-127/+158
|/
* p2p: added received at to peer messageobscuren2015-04-302-3/+5
* p2p/discover: fix api issues caused by leveldb updatePéter Szilágyi2015-04-281-4/+6
* p2p/discover: fix goroutine leak due to blocking on sync.OncePéter Szilágyi2015-04-282-13/+24
* p2p/discover: add node expirer and related testsPéter Szilágyi2015-04-273-4/+116
* p2p/discover: parametrize nodedb version, add persistency testsPéter Szilágyi2015-04-273-11/+62
* p2p/discover: drop a superfluous warningPéter Szilágyi2015-04-271-1/+1
* p2p/discover: wrap the pinger to update the node db tooPéter Szilágyi2015-04-271-4/+15
* p2p/discover: use iterator based seeding, drop old protocol testPéter Szilágyi2015-04-272-45/+118
* p2p/discover: write the basic tests, catch RLP bugPéter Szilágyi2015-04-273-8/+150
* p2p/discovery: fix issues raised in the nodeDb PRPéter Szilágyi2015-04-272-36/+32
* cmd/bootnode, eth, p2p, p2p/discover: use a fancier db designPéter Szilágyi2015-04-247-160/+277
* cmd/bootnode, eth, p2p, p2p/discover: clean up the seeder and mesh into eth.Péter Szilágyi2015-04-247-140/+157
* p2p/discovery: fix broken tests due to API updatePéter Szilágyi2015-04-242-4/+4
* p2p/discovery: use the seed table for finding nodes, auto drop stale onesPéter Szilágyi2015-04-242-5/+38
* cmd, eth, p2p, p2p/discover: init and clean up the seed cachePéter Szilágyi2015-04-244-8/+26
* p2p/discover: store nodes in leveldbFelix Lange2015-04-242-13/+73
* p2p: return zero node from Self if the server is not runningFelix Lange2015-04-221-1/+6
* p2p: make DiscReason bigger than byteFelix Lange2015-04-171-1/+1
* p2p/discover: use rlp.DecodeBytesFelix Lange2015-04-171-1/+1
* cmd/rlpdump, cmd/utils, eth, p2p, whisper: use rlp input limitFelix Lange2015-04-171-1/+2
* p2p: fix the dial timerFelix Lange2015-04-171-3/+8
* p2p: added limiter function to limit package broadcastingobscuren2015-04-141-0/+13
* p2p/discover: improve timer handling for reply timeoutsFelix Lange2015-04-141-2/+3
* p2p/discover: remove unused field Node.activeStampFelix Lange2015-04-132-16/+0
* p2p: fix unsynchronized map access during Server shutdownFelix Lange2015-04-131-0/+2
* p2p: fix yet another disconnect hangFelix Lange2015-04-131-22/+8
* p2p: fix goroutine leak when handshake read failsFelix Lange2015-04-131-1/+1
* p2p: limit number of lingering inbound pre-handshake connectionsFelix Lange2015-04-101-1/+19
* p2p: use RLock instead of Lock for pre-dial checksFelix Lange2015-04-101-10/+12
* p2p: improve disconnect signaling at handshake timeFelix Lange2015-04-104-35/+111
* p2p: don't mess with the socket deadline in Peer.readLoopFelix Lange2015-04-101-1/+0
* p2p: properly decrement peer wait group counter for setup errorsFelix Lange2015-04-101-0/+11
* p2p: fix Peer shutdown deadlocksFelix Lange2015-04-104-78/+139
* p2p: improve peer selection logicFelix Lange2015-04-101-56/+61
* p2p/discover: don't log packet contentFelix Lange2015-04-101-3/+4
* p2p/discover: make packet processing less concurrentFelix Lange2015-04-101-6/+4
* Updated loggingobscuren2015-04-073-29/+27
* p2p/discover: fix off by one error causing buckets to contain duplicatesFelix Lange2015-04-012-1/+43
* p2p/discover: implement node bondingFelix Lange2015-04-015-383/+649
* p2p/discover: add version number to ping packetFelix Lange2015-04-011-0/+8
* fix p2p/testlog_testzelig2015-03-241-5/+2
* Merge branch 'develop' into conversionobscuren2015-03-212-3/+3
|\
| * %#x => %xobscuren2015-03-202-3/+3
* | p2p: interrupt MsgPipe payload read/writeFelix Lange2015-03-191-3/+6
* | p2p: log disconnect requestsFelix Lange2015-03-191-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:19:16 +0800