[tor-commits] [tor/master] Merge branch 'no-exit-bootstrap-squashed'

[nickm at torproject.org]

commit 5b770ac7b7d8c44a28666da53921be3a2dedc94c
Merge: dc1aaa5 2b8e1f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 30 09:06:47 2014 -0500

    Merge branch 'no-exit-bootstrap-squashed'

 changes/bug13718-add-internal-bootstrap-statuses |    9 +
 changes/bug13718-avoid-excluding-guards          |    8 +
 changes/bug13718-check-consensus-exits           |    6 +
 changes/bug13718-make-nodelist-args-readable     |    8 +
 changes/bug13814-avoid-exit-paths-no-exits       |   25 +++
 changes/bug13814-reachability-without-exits      |   15 ++
 changes/bug13924-fix-testing-reachability        |    7 +
 src/or/circuitbuild.c                            |   24 ++-
 src/or/circuituse.c                              |   98 ++++++---
 src/or/config.c                                  |    2 +-
 src/or/control.c                                 |   30 ++-
 src/or/dirserv.c                                 |    2 +-
 src/or/nodelist.c                                |  231 ++++++++++++++++++----
 src/or/nodelist.h                                |   30 +++
 14 files changed, 420 insertions(+), 75 deletions(-)