]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d96223 d40e869)
Merge branch 'maint-0.2.7' into maint-0.2.8
authorRoger Dingledine <arma@torproject.org>
Wed, 11 May 2016 17:42:40 +0000 (13:42 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 11 May 2016 17:42:40 +0000 (13:42 -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