From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Apr 2014 19:37:15 +0000 (-0400)
Subject: Merge branch 'bug2454_025_squashed'
X-Git-Tag: tor-0.2.5.4-alpha~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=689863d0a9432250f2c9a67e3e7ba2c4e5dae4c6;p=thirdparty%2Ftor.git

Merge branch 'bug2454_025_squashed'
---

689863d0a9432250f2c9a67e3e7ba2c4e5dae4c6