From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 17 Jun 2015 13:19:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.2-alpha~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43a98c7da6183e6e2e20784faed9f1c8aea5086e;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.6'
---

43a98c7da6183e6e2e20784faed9f1c8aea5086e