From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 8 Jun 2015 14:33:38 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.2-alpha~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0c0a6085e7e6395e4f5819ba47076786ae2f2b0;p=thirdparty%2Ftor.git

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

c0c0a6085e7e6395e4f5819ba47076786ae2f2b0