From: Roger Dingledine Date: Wed, 11 May 2016 17:42:40 +0000 (-0400) Subject: Merge branch 'maint-0.2.7' into maint-0.2.8 X-Git-Tag: tor-0.2.8.3-alpha~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=163cee1b6489c8966681b420d6da49e8ff4a9d1f;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.7' into maint-0.2.8 --- 163cee1b6489c8966681b420d6da49e8ff4a9d1f