From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 28 Oct 2011 22:05:25 +0000 (-0400)
Subject: Merge branch 'bug4343'
X-Git-Tag: tor-0.2.3.7-alpha~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dd8d811d669e245f95ed0fcc59de579e876ab91;p=thirdparty%2Ftor.git

Merge branch 'bug4343'
---

4dd8d811d669e245f95ed0fcc59de579e876ab91