From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Mar 2015 14:24:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=572b9ff4d7937a568bc786f7dce08b34011de7d9;p=thirdparty%2Ftor.git

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

572b9ff4d7937a568bc786f7dce08b34011de7d9