From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Mar 2015 18:59:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug15269'
X-Git-Tag: tor-0.2.7.1-alpha~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25c3ff4500f912f3a9d19003bc6dab9cf6f00312;p=thirdparty%2Ftor.git

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

25c3ff4500f912f3a9d19003bc6dab9cf6f00312