[tor-commits] [tor/master] Merge branch 'bug6690_022' into maint-0.2.2

[nickm at torproject.org]

commit 1c30e6abc93fa086a14d01d838066581a3657285
Merge: d48cebc 62d9628
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 27 16:03:48 2012 -0400

    Merge branch 'bug6690_022' into maint-0.2.2

 changes/bug6690   |    7 +++++++
 src/or/policies.c |    6 +++++-
 2 files changed, 12 insertions(+), 1 deletions(-)