From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Dec 2012 15:35:41 +0000 (-0500)
Subject: Merge branch 'bug3443_squashed'
X-Git-Tag: tor-0.2.4.7-alpha~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4f7e7a6f8a59fee532c5eca4cb71f2b28b5a1ad;p=thirdparty%2Ftor.git

Merge branch 'bug3443_squashed'
---

f4f7e7a6f8a59fee532c5eca4cb71f2b28b5a1ad