From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 28 Apr 2014 19:52:57 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug11608'
X-Git-Tag: tor-0.2.5.5-alpha~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdc64f020c926cd51b037b85b5eba5bf08d66e7d;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug11608'
---

cdc64f020c926cd51b037b85b5eba5bf08d66e7d