[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3560'

[nickm at torproject.org]

commit 2163e420b2aea36b57a620eb4bb2ff1e7c9e966f
Merge: 99348ce b49e561
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 18 17:57:06 2011 -0400

    Merge remote-tracking branch 'public/bug3560'

 changes/microdescs_on |    5 +++++
 src/or/config.c       |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)