[tor-commits] [tor/master] Merge remote-tracking branch 'asn/remove_legacy_guards'

[nickm at torproject.org]

commit fae4d3d9250ecc6cd34a70b642009bf8923a51f4
Merge: d95d988 b047d97
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 24 09:01:25 2017 -0500

    Merge remote-tracking branch 'asn/remove_legacy_guards'

 src/or/bridges.c           |   20 +-
 src/or/channel.c           |   13 -
 src/or/circpathbias.c      |    8 -
 src/or/circuitbuild.c      |   25 +-
 src/or/circuituse.c        |    4 -
 src/or/config.c            |   20 -
 src/or/connection_or.c     |   10 -
 src/or/directory.c         |    5 +-
 src/or/entrynodes.c        | 2041 ++------------------------------------------
 src/or/entrynodes.h        |  130 +--
 src/or/or.h                |   12 -
 src/or/routerlist.c        |   15 -
 src/test/test_entrynodes.c |  786 -----------------
 src/test/test_routerlist.c |   84 --
 14 files changed, 100 insertions(+), 3073 deletions(-)