[tor-commits] [tor/master] Merge remote-tracking branch 'rransom/warn-about-hses-without-guards'

[nickm at torproject.org]

commit 95d9f7e9cce96d684a1f0279aa82c68d0b6182be
Merge: dc014c9 38609f1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 25 12:39:00 2012 -0400

    Merge remote-tracking branch 'rransom/warn-about-hses-without-guards'

 changes/warn-about-hses-without-guards |    8 ++++++++
 src/or/config.c                        |    9 +++++++++
 src/or/dirvote.c                       |    2 +-
 3 files changed, 18 insertions(+), 1 deletions(-)