From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Jun 2015 15:46:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.2-alpha~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80fb1ef8ba8406f7ed335d7ffd06cdf058cca80f;p=thirdparty%2Ftor.git

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

80fb1ef8ba8406f7ed335d7ffd06cdf058cca80f