From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 21 Jul 2014 18:30:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=641c1584f7be8de88d3c58eae96c5c022a4870d1;p=thirdparty%2Ftor.git

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

641c1584f7be8de88d3c58eae96c5c022a4870d1