Merge remote branch 'rransom/policy_summarize-assert' into maint-0.2.1
commit1471e577432273d51aa13919603a648437d05fea
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Jan 2011 19:59:23 +0000 (20 14:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Jan 2011 19:59:23 +0000 (20 14:59 -0500)
tree12d5168d158c3a36a6e01e04a717f9a2aefdabf9
parentc8f94eed12c0a7e8226bdadcd26570e29152f299
parent43414eb98821d3b5c6c65181d7545ce938f82c8e
Merge remote branch 'rransom/policy_summarize-assert' into maint-0.2.1