From: Roger Dingledine <arma@torproject.org>
Date: Thu, 24 Jul 2014 20:30:50 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb3e0e3da300f6c7c4e04386de872b4949a9baaf;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5'
---

eb3e0e3da300f6c7c4e04386de872b4949a9baaf