From: Roger Dingledine <arma@torproject.org>
Date: Mon, 28 Jul 2014 06:47:43 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c4a26b8ca3d8f61f55ad63baea2090e44fbc126;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5'
---

6c4a26b8ca3d8f61f55ad63baea2090e44fbc126