From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Apr 2012 15:18:41 +0000 (-0400)
Subject: Merge branch 'bug4438-v2'
X-Git-Tag: tor-0.2.3.15-alpha~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=461771ebbce3a86965eb2d696f9d42e9bcb777c9;p=thirdparty%2Ftor.git

Merge branch 'bug4438-v2'
---

461771ebbce3a86965eb2d696f9d42e9bcb777c9