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

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

e3b6373003da33a0a9e9817868abbaea65bd5cec