From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 10 Jun 2014 15:17:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug12227_024'
X-Git-Tag: tor-0.2.5.5-alpha~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55c7a559df5f349de21ca37ecfe19b736085c317;p=thirdparty%2Ftor.git

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

55c7a559df5f349de21ca37ecfe19b736085c317