From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 May 2015 18:06:01 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.2-alpha~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b66f4cfc9dfdde9e233424ba4c9c25127adc3435;p=thirdparty%2Ftor.git

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

b66f4cfc9dfdde9e233424ba4c9c25127adc3435