From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 Nov 2011 18:18:56 +0000 (-0500)
Subject: Merge branch 'bug4538_v2'
X-Git-Tag: tor-0.2.3.9-alpha~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60b41cd435c0acef274209a2a9b494b5f42964f6;p=thirdparty%2Ftor.git

Merge branch 'bug4538_v2'
---

60b41cd435c0acef274209a2a9b494b5f42964f6