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

[nickm at torproject.org]

commit e93234af70da5cf3d513e57b12e4934b1c4d9529
Merge: e33c85a 236e8b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 8 16:49:24 2016 -0500

    Merge branch 'feature15056_v1_squashed'

 changes/feature15056             |  28 ++
 doc/tor.1.txt                    |  14 +
 src/common/crypto_ed25519.c      |  20 +
 src/common/crypto_ed25519.h      |   6 +
 src/common/crypto_format.c       |  16 +
 src/common/crypto_format.h       |   1 +
 src/or/channel.c                 | 151 ++++++-
 src/or/channel.h                 |  40 +-
 src/or/channeltls.c              |  18 +-
 src/or/circuitbuild.c            |  98 +++--
 src/or/circuitbuild.h            |   6 +-
 src/or/circuituse.c              |  11 +-
 src/or/config.c                  |   2 +
 src/or/connection.c              |   4 +-
 src/or/connection_or.c           | 299 ++++++++-----
 src/or/connection_or.h           |   5 +-
 src/or/dirserv.c                 |  35 +-
 src/or/dirserv.h                 |   3 +-
 src/or/entrynodes.c              |  33 +-
 src/or/entrynodes.h              |   3 +-
 src/or/main.c                    |   4 +-
 src/or/nodelist.c                |  70 +++
 src/or/nodelist.h                |   5 +
 src/or/onion.c                   | 314 +++++++++-----
 src/or/onion.h                   |   2 +
 src/or/or.h                      |  18 +-
 src/or/router.c                  |   7 +
 src/or/routerkeys.c              |   8 +
 src/or/routerkeys.h              |   2 +
 src/test/test_cell_formats.c     |  35 +-
 src/test/test_channel.c          | 106 +++++
 src/test/test_link_handshake.c   |  10 +-
 src/trunnel/ed25519_cert.c       | 911 ++++++++++++++++++++++++++++++++++++++-
 src/trunnel/ed25519_cert.h       | 318 ++++++++++++++
 src/trunnel/ed25519_cert.trunnel |  53 +--
 35 files changed, 2299 insertions(+), 357 deletions(-)