From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Jan 2017 14:02:48 +0000 (-0500)
Subject: Merge branch 'bug19769_19025_029'
X-Git-Tag: tor-0.3.0.2-alpha~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e69afb853dde958c6efd94dfdb0cd18f01f7d841;p=thirdparty%2Ftor.git

Merge branch 'bug19769_19025_029'
---

e69afb853dde958c6efd94dfdb0cd18f01f7d841