From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 Mar 2015 18:10:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5190ff25a2934560e1c44e283306f24bc062047b;p=thirdparty%2Ftor.git

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

5190ff25a2934560e1c44e283306f24bc062047b