From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 28 Apr 2014 16:00:50 +0000 (-0400)
Subject: Merge branch 'bug8966_v5'
X-Git-Tag: tor-0.2.5.5-alpha~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b825ffc4ffbff946a1fc7f5a4cfedf8e5317e79;p=thirdparty%2Ftor.git

Merge branch 'bug8966_v5'
---

9b825ffc4ffbff946a1fc7f5a4cfedf8e5317e79