From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 18 May 2015 15:56:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'special/bug16060'
X-Git-Tag: tor-0.2.7.2-alpha~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d3b3a4a2308c955f75825a145a22997b7008552;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'special/bug16060'
---

0d3b3a4a2308c955f75825a145a22997b7008552