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

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

113dc51020bc6e6cf4702ac55e3bf17f3833fe99