From: Nick Mathewson Date: Thu, 20 Jan 2011 19:59:23 +0000 (-0500) Subject: Merge remote branch 'rransom/policy_summarize-assert' into maint-0.2.1 X-Git-Tag: tor-0.2.2.22-alpha~4^2~1^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1471e577432273d51aa13919603a648437d05fea;p=thirdparty%2Ftor.git Merge remote branch 'rransom/policy_summarize-assert' into maint-0.2.1 --- 1471e577432273d51aa13919603a648437d05fea