From: Nick Mathewson Date: Tue, 5 Jul 2016 17:06:06 +0000 (-0400) Subject: Merge branch 'maint-0.2.8' X-Git-Tag: tor-0.2.9.1-alpha~70 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0603779114920dabb3ec0178f2b646480619c372;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.8' This is an "ours" merge, to avoid messing with the version. --- 0603779114920dabb3ec0178f2b646480619c372