From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 Mar 2015 16:53:31 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5cbc58094ec740e768d5fa88a51c20c645ed70e;p=thirdparty%2Ftor.git

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

d5cbc58094ec740e768d5fa88a51c20c645ed70e