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

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

2914d56ea4c767bbfa956afba64032c90a27f4eb