From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Jan 2019 13:25:35 +0000 (-0500)
Subject: Merge branch 'bug24953_squashed'
X-Git-Tag: tor-0.4.0.1-alpha~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a61d3f5adf1e4e61a0d51fb6f9368339f5330cc;p=thirdparty%2Ftor.git

Merge branch 'bug24953_squashed'
---

9a61d3f5adf1e4e61a0d51fb6f9368339f5330cc