From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 Mar 2015 11:29:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ae9769b29330815c6c094ef43bafd6fa13b7626;p=thirdparty%2Ftor.git

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

6ae9769b29330815c6c094ef43bafd6fa13b7626