From: Nick Mathewson Date: Wed, 11 May 2016 17:20:51 +0000 (-0400) Subject: Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8 X-Git-Tag: tor-0.2.8.3-alpha~30 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d962233f65022dc7fbc0466c981e3e7f2aea0c8;p=thirdparty%2Ftor.git Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8 --- 8d962233f65022dc7fbc0466c981e3e7f2aea0c8