From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Feb 2016 16:34:06 +0000 (-0500)
Subject: Merge branch 'bug17852_revised'
X-Git-Tag: tor-0.2.8.2-alpha~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cd6c577df3b3f59a8380b03e45d437aa593d326;p=thirdparty%2Ftor.git

Merge branch 'bug17852_revised'
---

5cd6c577df3b3f59a8380b03e45d437aa593d326