]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'asn-mytor/bug4725_take2'
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2011 19:28:31 +0000 (14:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2011 19:28:31 +0000 (14:28 -0500)
commit26053bd7c90b2bd8e72bc836c48434c8d6de633f
tree74c1be7776a7a4ad2c9d0bceb7a1ec0e0a634fe1
parentba1766bc3f2ed18662f3ef3a527ca75a54ee9595
parent539cb627f71b476eb325ae6fff829b1f360ada00
Merge remote-tracking branch 'asn-mytor/bug4725_take2'
src/or/transports.c