From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 Apr 2014 21:59:01 +0000 (-0400)
Subject: Merge branch 'bug11464_023_squashed' into maint-0.2.3
X-Git-Tag: tor-0.2.5.4-alpha~51^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75b4975d7722d9497847fdab8dcfb2ac10f58fdb;p=thirdparty%2Ftor.git

Merge branch 'bug11464_023_squashed' into maint-0.2.3
---

75b4975d7722d9497847fdab8dcfb2ac10f58fdb