]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e482541 a77187a)
Merge remote-tracking branch 'teor/bug20484_029_v2' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 21:12:13 +0000 (16:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 21:12:13 +0000 (16:12 -0500)
1  2 
doc/tor.1.txt patch | diff1 | diff2 | blob | history

diff --cc doc/tor.1.txt
Simple merge
Mirror of https://git.torproject.org/tor.git