]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c68b2f ff7e853)
Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Tue, 1 Aug 2017 15:24:02 +0000 (11:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 1 Aug 2017 15:24:02 +0000 (11:24 -0400)
1  2 
src/or/dirserv.c patch | diff1 | diff2 | blob | history

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