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

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

d8263ac254933bb8a4809aae9ff034923e2dccae