From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Feb 2015 16:36:34 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e9409ef58139d557bb7e9bd7536896a88a5d6e9;p=thirdparty%2Ftor.git

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

3e9409ef58139d557bb7e9bd7536896a88a5d6e9