From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Mar 2015 17:08:20 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed7f2482e2de6f5d08dfcd605626ae8ee373cace;p=thirdparty%2Ftor.git

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

ed7f2482e2de6f5d08dfcd605626ae8ee373cace