From: Roger Dingledine <arma@torproject.org>
Date: Fri, 25 Jul 2014 16:22:41 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f39c0e63e5b5460ea52b6a217aa4cc658d7a425;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5'
---

3f39c0e63e5b5460ea52b6a217aa4cc658d7a425