From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 Jun 2014 15:01:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug11970'
X-Git-Tag: tor-0.2.5.5-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f20dd7bfc256e650b0d04f70f06c9837b90158d;p=thirdparty%2Ftor.git

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

6f20dd7bfc256e650b0d04f70f06c9837b90158d