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

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

2f67a6e8c95aadadfc55b6245668471f7def72e6