]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 661bd3f b1c4b3a)
Merge remote-tracking branch 'linus/bug6621'
authorNick Mathewson <nickm@torproject.org>
Tue, 21 Aug 2012 14:21:53 +0000 (10:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 21 Aug 2012 14:21:53 +0000 (10:21 -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