[tor-commits] [tor/master] Merge branch 'feature17576-UseDefaultFallbackDirs-v2-squashed'

[nickm at torproject.org]

commit 54433993c7c84dc9af878ebaf8dd1deae8c595e3
Merge: fec5aa7 080ae03
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 15 12:19:08 2015 -0500

    Merge branch 'feature17576-UseDefaultFallbackDirs-v2-squashed'

 changes/feature17576-UseDefaultFallbackDirs |    4 ++
 doc/tor.1.txt                               |    8 ++-
 src/or/config.c                             |   13 ++++-
 src/or/or.h                                 |    2 +
 src/test/test_config.c                      |   70 ++++++++++++++++++++-------
 5 files changed, 77 insertions(+), 20 deletions(-)