From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 6 Apr 2015 14:03:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.1-alpha~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65cd681635f54e40dfae3091d0dc6ddf53b7fdd0;p=thirdparty%2Ftor.git

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

65cd681635f54e40dfae3091d0dc6ddf53b7fdd0