From: Nick Mathewson Date: Mon, 9 Dec 2019 21:01:22 +0000 (-0500) Subject: Merge branch 'maint-0.3.5' into maint-0.4.0 X-Git-Tag: tor-0.4.1.8~10^2~1^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8;p=thirdparty%2Ftor.git Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump. --- 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8