[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] [tor/maint-0.2.2] Merge remote branch 'rransom/policy_summarize-assert' into maint-0.2.1

commit 1471e577432273d51aa13919603a648437d05fea
Merge: c8f94ee 43414eb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jan 20 14:59:23 2011 -0500

    Merge remote branch 'rransom/policy_summarize-assert' into maint-0.2.1

 changes/policy_summarize-assert |    6 ++++++
 src/or/policies.c               |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)