From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Sep 2014 03:48:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73ee161d8a7bc06eefa58654cbfe421449921eec;p=thirdparty%2Ftor.git

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

73ee161d8a7bc06eefa58654cbfe421449921eec