From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Jan 2012 19:50:22 +0000 (-0500)
Subject: Merge branch 'bug4012_023_squashed'
X-Git-Tag: tor-0.2.3.11-alpha~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d04bf66120420e89ddb479316f4026869abc9154;p=thirdparty%2Ftor.git

Merge branch 'bug4012_023_squashed'
---

d04bf66120420e89ddb479316f4026869abc9154