From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 18 Nov 2016 01:09:44 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug20630'
X-Git-Tag: tor-0.3.0.1-alpha~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a742637f5ae033a1f05490cbf1d4444cd0529d32;p=thirdparty%2Ftor.git

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

a742637f5ae033a1f05490cbf1d4444cd0529d32