commit 98c24670e7e87b61d57baad142b090df4a3dbbcb
Merge: 848333c 85659d3
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Tue Oct 23 16:28:34 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.3'
changes/bug7192 | 10 ++++++++
src/or/policies.c | 41 +++++++++++++++++++++++++++++----
src/or/policies.h | 1 +
src/test/test.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 113 insertions(+), 5 deletions(-)