From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Dec 2014 16:00:02 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.2-alpha~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6ac752353e6b03b2cbf2822d8fe2c60dfb03746;p=thirdparty%2Ftor.git

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

c6ac752353e6b03b2cbf2822d8fe2c60dfb03746