From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 26 Nov 2018 21:33:31 +0000 (-0500)
Subject: Merge branch 'dormant_v2_squashed'
X-Git-Tag: tor-0.4.0.1-alpha~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d8e0cc9abf2a74789e635d2fd4d0e18b8e0d1fe;p=thirdparty%2Ftor.git

Merge branch 'dormant_v2_squashed'
---

7d8e0cc9abf2a74789e635d2fd4d0e18b8e0d1fe