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

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

6a8550fa3c1a435a5c6d3759b893b10f1899e570