]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1340bd 6e5486b)
Merge branch 'maint-0.2.9' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Mon, 22 May 2017 12:32:07 +0000 (08:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 22 May 2017 12:32:07 +0000 (08:32 -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