From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Feb 2014 17:28:42 +0000 (-0500)
Subject: Merge remote-tracking branch 'houqp/hs_control'
X-Git-Tag: tor-0.2.5.2-alpha~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fee7f25ff845dc9a99dac59e67fdb9517750176c;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'houqp/hs_control'
---

fee7f25ff845dc9a99dac59e67fdb9517750176c