From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Dec 2016 12:47:32 +0000 (-0500)
Subject: Merge branch 'bug20599_030_v4'
X-Git-Tag: tor-0.3.0.1-alpha~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e317a9cb7c91fac7b3583a86361d6bd613f18ee4;p=thirdparty%2Ftor.git

Merge branch 'bug20599_030_v4'
---

e317a9cb7c91fac7b3583a86361d6bd613f18ee4