From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 Jan 2012 20:07:58 +0000 (-0500)
Subject: Merge branch 'bug4889_v2'
X-Git-Tag: tor-0.2.3.11-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bd40a8eb0be195022558addb868edf56162f9dc;p=thirdparty%2Ftor.git

Merge branch 'bug4889_v2'
---

2bd40a8eb0be195022558addb868edf56162f9dc