From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 Jan 2012 00:23:44 +0000 (-0500)
Subject: Merge branch 'bug3825c_squashed'
X-Git-Tag: tor-0.2.3.11-alpha~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53d88eb1ecf7714772d9cb54a1d649e518dd5f47;p=thirdparty%2Ftor.git

Merge branch 'bug3825c_squashed'
---

53d88eb1ecf7714772d9cb54a1d649e518dd5f47