From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Jan 2015 12:50:14 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.3-alpha~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49dca8b1beae9c2dade2c3193fa7f77f5c15d869;p=thirdparty%2Ftor.git

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

49dca8b1beae9c2dade2c3193fa7f77f5c15d869