[tor-commits] [tor/master] Merge remote-tracking branch 'teor/fix-multi-dir'

[nickm at torproject.org]

commit b9714e1366a19dff1f9abe18a22dc4367788cc3c
Merge: e6be486 1b70497
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 16 20:04:49 2015 -0500

    Merge remote-tracking branch 'teor/fix-multi-dir'

 src/or/networkstatus.c |   14 ++--
 src/or/router.c        |    8 +--
 src/or/router.h        |    5 +-
 src/test/test_config.c |  169 ++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 181 insertions(+), 15 deletions(-)