commit 36801ba3c0c6a08e138cb09ecd7720a0ff711483 Merge: 3a2b86e 2ecee3f Author: Roger Dingledine arma@torproject.org Date: Tue Oct 23 17:26:21 2012 -0400

Merge branch 'maint-0.2.3' into release-0.2.3

changes/bug7190 | 6 +++++ changes/bug7192 | 10 ++++++++ src/or/policies.c | 46 ++++++++++++++++++++++++++++++------ src/or/policies.h | 1 + src/test/test.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 8 deletions(-)