From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 9 Dec 2011 16:29:03 +0000 (-0500)
Subject: Merge branch 'bug4655-squashed'
X-Git-Tag: tor-0.2.3.10-alpha~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7519dce98031c2adca3f0c8f28741a219845b6e;p=thirdparty%2Ftor.git

Merge branch 'bug4655-squashed'
---

b7519dce98031c2adca3f0c8f28741a219845b6e