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

Merge branch 'ahf_bugs_17847_2_squashed'
---

fa00f2dce5a93164e36860794b75c595067c2f63