From: teor <teor@torproject.org>
Date: Mon, 11 Nov 2019 04:19:39 +0000 (+1000)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~10^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29940511e3c431a2c62a3844c6b12a039eaed521;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.0
---

29940511e3c431a2c62a3844c6b12a039eaed521