[tor-commits] [tor/master] Merge branch 'bug3327_squashed'

[nickm at torproject.org]

commit 1ed1bf7f07350bce0eb4a73f29e1d8a2d7ffdbc8
Merge: 41eef66 3e3480d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 7 15:03:54 2011 -0400

    Merge branch 'bug3327_squashed'

 changes/bug3327    |   14 ++++++++++++
 src/or/directory.c |   53 +++++++++++++++++++++++---------------------
 src/or/main.c      |    6 +----
 src/or/router.c    |   61 +++++++++++++++++++++++++++++++++++++++++++++++++--
 src/or/router.h    |    3 +-
 5 files changed, 103 insertions(+), 34 deletions(-)