From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Feb 2017 00:10:20 +0000 (-0500)
Subject: Merge branch 'bug20894_029_v3'
X-Git-Tag: tor-0.3.0.4-rc~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e469c10020f92b6aa19cb3f4316fb040d837819;p=thirdparty%2Ftor.git

Merge branch 'bug20894_029_v3'
---

7e469c10020f92b6aa19cb3f4316fb040d837819