From: Roger Dingledine <arma@torproject.org>
Date: Sat, 20 Sep 2014 20:51:17 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e170205cd8aae085687ca3b166bcc38b2134fc22;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5'
---

e170205cd8aae085687ca3b166bcc38b2134fc22