From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 1 Apr 2014 13:39:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug11232'
X-Git-Tag: tor-0.2.5.4-alpha~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bef082d0a6047fd3625f548d60ad257aaed2fab;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug11232'
---

6bef082d0a6047fd3625f548d60ad257aaed2fab