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

[nickm at torproject.org]

commit 346c2eb4e60299f69327b5e63e1e25aaf678f964
Merge: 8b58e1e32 d00ed406e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 27 12:45:07 2018 -0400

    Merge branch 'bug25843_v2_squashed'

 changes/bug25843           |  3 +++
 doc/tor.1.txt              |  7 +++++++
 src/or/config.c            |  6 ++++++
 src/or/entrynodes.c        | 16 ++++++++++------
 src/or/or.h                |  2 ++
 src/test/test_entrynodes.c | 19 +++++++++++++++++++
 6 files changed, 47 insertions(+), 6 deletions(-)