]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'yawning/bug_8402'
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Sep 2014 03:41:55 +0000 (23:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Sep 2014 03:41:55 +0000 (23:41 -0400)
1  2 
src/or/config.c
src/or/connection.c
src/test/test_pt.c

diff --cc src/or/config.c
Simple merge
Simple merge
Simple merge