]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb35405 d465bd2)
Merge branch 'maint-0.2.9' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Wed, 2 May 2018 12:46:28 +0000 (08:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 2 May 2018 12:46:28 +0000 (08:46 -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