From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Jul 2012 21:19:47 +0000 (-0400)
Subject: Merge branch 'bug6480_squashed' into maint-0.2.3
X-Git-Tag: tor-0.2.4.1-alpha~75^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=122c8efb09643a65cbec6c991f3433774a4524ae;p=thirdparty%2Ftor.git

Merge branch 'bug6480_squashed' into maint-0.2.3
---

122c8efb09643a65cbec6c991f3433774a4524ae