From: Nick Mathewson Date: Fri, 7 Feb 2014 17:22:56 +0000 (-0500) Subject: Merge remote-tracking branch 'houqp/hs_control_fix' X-Git-Tag: tor-0.2.5.2-alpha~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1682a615f9af50f4380bf1bb44070f299422a0a;p=thirdparty%2Ftor.git Merge remote-tracking branch 'houqp/hs_control_fix' --- f1682a615f9af50f4380bf1bb44070f299422a0a