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

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

190ed66b06833bcf3016e93f1c4ad98d1ebdb98d