From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 Jun 2014 04:47:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug12170_024_v2'
X-Git-Tag: tor-0.2.5.5-alpha~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=723894f114ef091ba09e3ab7440d4339bbc21430;p=thirdparty%2Ftor.git

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

723894f114ef091ba09e3ab7440d4339bbc21430