From: Nick Mathewson Date: Wed, 7 Dec 2016 23:28:09 +0000 (-0500) Subject: Merge branch 'maint-0.2.8' into maint-0.2.9 X-Git-Tag: tor-0.2.9.7-rc~14^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f602172dbaa9b0db49d6de993c9e13a48d12079f;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.8' into maint-0.2.9 (ours merge, to avoid taking 20865 fix) --- f602172dbaa9b0db49d6de993c9e13a48d12079f