From: Nick Mathewson Date: Wed, 1 Mar 2017 13:19:23 +0000 (-0500) Subject: Merge branch 'maint-0.2.9' into maint-0.3.0 X-Git-Tag: tor-0.3.0.4-rc~8^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ff31ff5b34fd69383b366d38e997822f0442086;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.9' into maint-0.3.0 "Ours" merge to avoid version bump --- 5ff31ff5b34fd69383b366d38e997822f0442086