From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 24 Sep 2018 15:25:39 +0000 (-0400)
Subject: Merge branch 'pr_339_squashed'
X-Git-Tag: tor-0.3.5.3-alpha~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b90972dc6c13a252368faf5aa8003a89495a96e;p=thirdparty%2Ftor.git

Merge branch 'pr_339_squashed'
---

6b90972dc6c13a252368faf5aa8003a89495a96e