[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9596' into maint-0.2.4

[nickm at torproject.org]

commit 0c3c47565da970839b3701f60fd310ba059ed8af
Merge: 0bec652 a5f6cb9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 8 12:10:47 2013 -0400

    Merge remote-tracking branch 'public/bug9596' into maint-0.2.4

 changes/bug9596   |    4 ++++
 src/or/policies.h |    7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)