From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 28 Apr 2015 18:46:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7286a27cfc74ca81ed71a8579ded95b25564708a;p=thirdparty%2Ftor.git

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

7286a27cfc74ca81ed71a8579ded95b25564708a