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

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

a201a5396e9aef779386216e2a21bfeb75d3d9c6