]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4056c61 b45f0f8)
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Wed, 13 Aug 2014 16:52:40 +0000 (12:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 Aug 2014 16:52:40 +0000 (12:52 -0400)
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