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

Merge branch 'bug4893'
---

a812e8b6a875241839e2fd367c31b9e446977dff