]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8391c96 1196ed7)
Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Sep 2014 14:51:39 +0000 (10:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Sep 2014 14:51:39 +0000 (10:51 -0400)
1  2 
src/or/relay.c patch | diff1 | diff2 | blob | history

diff --cc src/or/relay.c
Simple merge
Mirror of https://git.torproject.org/tor.git