From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Mar 2015 20:25:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59f4c410879961e77c1ec3f8937f1af7af1b011b;p=thirdparty%2Ftor.git

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

59f4c410879961e77c1ec3f8937f1af7af1b011b