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

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

16b1b2199d1e23968ab74a8ab08d59e8aae90423