From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 14 Oct 2016 14:23:24 +0000 (-0400)
Subject: Merge branch 'bug20176_v2'
X-Git-Tag: tor-0.2.9.4-alpha~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac707ae70a100ab838c4b65f31cbf130b4bef583;p=thirdparty%2Ftor.git

Merge branch 'bug20176_v2'
---

ac707ae70a100ab838c4b65f31cbf130b4bef583