]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c52d3c ec61ae5)
Merge branch 'maint-0.2.9' into maint-0.3.0
authorRoger Dingledine <arma@torproject.org>
Thu, 25 May 2017 04:27:27 +0000 (00:27 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 25 May 2017 04:27:27 +0000 (00:27 -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