From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Oct 2012 07:02:57 +0000 (-0400)
Subject: Merge branch 'bug7149' into maint-0.2.3
X-Git-Tag: tor-0.2.4.4-alpha~5^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6931b010512d3d8cbda24c87a8cf379305e1457;p=thirdparty%2Ftor.git

Merge branch 'bug7149' into maint-0.2.3
---

b6931b010512d3d8cbda24c87a8cf379305e1457