From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 21 Mar 2016 14:32:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'special/bug18600'
X-Git-Tag: tor-0.2.8.2-alpha~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13eb120beaff5e006c0eb9a3fc8563c5df16a328;p=thirdparty%2Ftor.git

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

13eb120beaff5e006c0eb9a3fc8563c5df16a328