From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 Dec 2011 21:34:55 +0000 (-0500)
Subject: Merge branch 'bug1827_squashed'
X-Git-Tag: tor-0.2.3.11-alpha~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=949583d9f74a7003f5780e786a253eb66f2f8f54;p=thirdparty%2Ftor.git

Merge branch 'bug1827_squashed'
---

949583d9f74a7003f5780e786a253eb66f2f8f54