From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 31 Aug 2012 22:39:11 +0000 (-0400)
Subject: Merge branch 'bug6732' into maint-0.2.3
X-Git-Tag: tor-0.2.4.1-alpha~27^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b17bb543dab3e34f5076649707bc74d5d3bd62fd;p=thirdparty%2Ftor.git

Merge branch 'bug6732' into maint-0.2.3
---

b17bb543dab3e34f5076649707bc74d5d3bd62fd