From: Nick Mathewson Date: Sat, 12 Mar 2011 04:30:25 +0000 (-0500) Subject: Merge branch 'hsdir_assignment' into maint-0.2.2 X-Git-Tag: tor-0.2.3.1-alpha~77^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d34a5cdc597824e72453009ed209e5644f158e90;p=thirdparty%2Ftor.git Merge branch 'hsdir_assignment' into maint-0.2.2 --- d34a5cdc597824e72453009ed209e5644f158e90