]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6efd77 518ef61)
Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Feb 2017 16:00:02 +0000 (11:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Feb 2017 16:00:02 +0000 (11:00 -0500)
1  2 
src/or/directory.c patch | diff1 | diff2 | blob | history

diff --cc src/or/directory.c
Simple merge
Mirror of https://git.torproject.org/tor.git