From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 May 2015 15:03:05 +0000 (-0400)
Subject: Merge branch 'bug15823_025' into maint-0.2.5
X-Git-Tag: tor-0.2.7.2-alpha~160^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8aa04408fb724d55e95419ec9f0568c7d733acb5;p=thirdparty%2Ftor.git

Merge branch 'bug15823_025' into maint-0.2.5
---

8aa04408fb724d55e95419ec9f0568c7d733acb5