From: Nick Mathewson Date: Tue, 23 Oct 2018 23:54:04 +0000 (-0400) Subject: Merge branch 'maint-0.3.4' into maint-0.3.5 X-Git-Tag: tor-0.3.5.4-alpha~41 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=131ab9d5233a2f452c608bf85a39255903d036c1;p=thirdparty%2Ftor.git Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" version to avoid removing rust use declaration. --- 131ab9d5233a2f452c608bf85a39255903d036c1