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

[nickm at torproject.org]

commit 2df7f1d59dcf613725ff5273cc792f93fb2e3031
Merge: ca19a95d5 80d388736
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 8 12:18:22 2017 -0400

    Merge branch 'ed25519_lookup'

 src/or/addressmap.c        |   2 +-
 src/or/circuitbuild.c      |  11 +--
 src/or/circuituse.c        |   6 +-
 src/or/connection_edge.c   |   9 +-
 src/or/control.c           |  16 ++--
 src/or/networkstatus.c     |  18 +---
 src/or/networkstatus.h     |   3 -
 src/or/nodelist.c          | 226 ++++++++++++++++++++++++++++++++++++---------
 src/or/nodelist.h          |  12 ++-
 src/or/or.h                |   9 ++
 src/or/rendservice.c       |   2 +-
 src/or/router.c            |   2 +-
 src/or/routerlist.c        |  12 ++-
 src/or/routerlist.h        |   2 +-
 src/or/routerset.c         |   2 +-
 src/test/test_hs_service.c |   1 +
 src/test/test_nodelist.c   | 104 +++++++++++++++++++++
 src/test/test_routerset.c  |  18 ++--
 18 files changed, 345 insertions(+), 110 deletions(-)