From: Nick Mathewson Date: Sun, 12 Jul 2015 17:34:22 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.6' X-Git-Tag: tor-0.2.7.2-alpha~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b80ff1b45c6c60a28dcbd40cdc3ab9cb421ed81;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.6' This is an "ours" merge to avoid bumping the version number in master. --- 6b80ff1b45c6c60a28dcbd40cdc3ab9cb421ed81