commit e232938ec82c8c35b99331995d1aeaca67ba9ec1 Merge: 0ccd57f 443e4ae Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 27 16:09:29 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6690 | 7 +++++++ src/or/policies.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletions(-)