]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'asn/bug3589'
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Jul 2012 16:05:08 +0000 (12:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Jul 2012 16:05:08 +0000 (12:05 -0400)
1  2 
src/or/circuitbuild.c
src/or/connection.c

Simple merge
Simple merge