From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 26 May 2015 13:41:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.2-alpha~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=115dd554c5d0126c1b006f283f6411733b3a70b1;p=thirdparty%2Ftor.git

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

115dd554c5d0126c1b006f283f6411733b3a70b1