]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Thu, 31 Oct 2013 18:02:28 +0000 (14:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 31 Oct 2013 18:02:28 +0000 (14:02 -0400)
1  2 
doc/tor.1.txt
src/common/tortls.c

diff --cc doc/tor.1.txt
Simple merge
Simple merge