From: Nick Mathewson Date: Thu, 15 Nov 2018 21:55:42 +0000 (-0500) Subject: Merge branch 'maint-0.3.4' into maint-0.3.5 X-Git-Tag: tor-0.3.5.5-alpha~5^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8af8ecabbe429503a4ff9d5510df610907c6e45a;p=thirdparty%2Ftor.git Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid duplicating conflict resolution in merge of 24104 --- 8af8ecabbe429503a4ff9d5510df610907c6e45a