]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e78b7e2 80bed1a)
Merge remote-tracking branch 'dgoulet/bug14202_026_v1'
authorNick Mathewson <nickm@torproject.org>
Mon, 2 Feb 2015 15:16:48 +0000 (10:16 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 2 Feb 2015 15:16:48 +0000 (10:16 -0500)
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