From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 29 Jul 2015 14:48:29 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.3-rc~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b7cb0d779ee3ea9ff9e1cd8682662c3d0ce6813;p=thirdparty%2Ftor.git

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

7b7cb0d779ee3ea9ff9e1cd8682662c3d0ce6813