From: Nick Mathewson Date: Sun, 12 Jul 2015 20:37:59 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.6' X-Git-Tag: tor-0.2.7.2-alpha~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb4604c35a97a27d2a16786c81a5499c46914dad;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.6' This is an 'ours' merge, to avoid taking the bump to 0.2.6.10-dev --- eb4604c35a97a27d2a16786c81a5499c46914dad