[tor-commits] [tor/master] Merge remote-tracking branch 'github/shrink_or_h_more'

nickm at torproject.org nickm at torproject.org
Tue Jul 3 15:11:30 UTC 2018


commit 77e678c20daf8633ce1904dd1df28398d820f7c0
Merge: a01b4d7f8 518ebe14d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 11:09:54 2018 -0400

    Merge remote-tracking branch 'github/shrink_or_h_more'

 src/lib/compress/compress.h           |    4 +-
 src/lib/crypt_ops/crypto_curve25519.h |   11 +-
 src/lib/crypt_ops/crypto_dh.c         |    4 +-
 src/lib/crypt_ops/crypto_dh.h         |    5 +-
 src/lib/crypt_ops/crypto_ed25519.h    |   14 +-
 src/lib/crypt_ops/crypto_format.h     |   20 +-
 src/lib/defs/dh_sizes.h               |   13 +
 src/lib/defs/include.am               |    6 +-
 src/lib/defs/x25519_sizes.h           |   27 +
 src/or/addr_policy_st.h               |   46 +
 src/or/addressmap.c                   |    4 +-
 src/or/bridges.h                      |    4 +-
 src/or/cell_queue_st.h                |    3 +-
 src/or/channel.c                      |    2 +-
 src/or/channel.h                      |  158 ++-
 src/or/channelpadding.c               |    2 +-
 src/or/channeltls.c                   |    3 +-
 src/or/channeltls.h                   |    6 +-
 src/or/circpathbias.h                 |    3 +-
 src/or/circuit_st.h                   |   14 +-
 src/or/circuitbuild.h                 |   14 +-
 src/or/circuitlist.c                  |    4 +-
 src/or/circuitlist.h                  |  142 +-
 src/or/circuitmux_ewma.c              |    2 +-
 src/or/circuitstats.c                 |    2 +
 src/or/circuitstats.h                 |   87 +-
 src/or/config.c                       |   14 +
 src/or/config.h                       |   20 +-
 src/or/confparse.c                    |    1 +
 src/or/confparse.h                    |   11 +-
 src/or/connection.c                   |   10 +
 src/or/connection.h                   |   89 +-
 src/or/connection_edge.c              |    2 +-
 src/or/connection_edge.h              |   49 +-
 src/or/connection_or.c                |    5 +-
 src/or/connection_or.h                |   56 +-
 src/or/connection_st.h                |   18 +
 src/or/conscache.c                    |    2 +-
 src/or/conscache.h                    |    9 +-
 src/or/consdiffmgr.c                  |    4 +-
 src/or/consdiffmgr.h                  |    7 +-
 src/or/control.c                      |   10 +-
 src/or/control.h                      |   91 +-
 src/or/crypt_path_st.h                |   18 +-
 src/or/desc_store_st.h                |    7 +-
 src/or/dir_connection_st.h            |    5 +-
 src/or/dirauth/dirvote.c              |    2 +
 src/or/dirauth/shared_random_state.c  |    4 +-
 src/or/dirauth/shared_random_state.h  |    7 +-
 src/or/directory.c                    |   13 +-
 src/or/directory.h                    |   88 +-
 src/or/dirserv.c                      |    3 +
 src/or/dirserv.h                      |   20 +-
 src/or/dns.c                          |    6 +-
 src/or/dnsserv.c                      |    2 +-
 src/or/dos.c                          |    2 +-
 src/or/entrynodes.c                   |    2 +
 src/or/entrynodes.h                   |    3 +-
 src/or/ext_orport.h                   |   20 +-
 src/or/extend_info_st.h               |    4 +-
 src/or/geoip.h                        |   59 +-
 src/or/hibernate.c                    |    7 +-
 src/or/hs_cache.c                     |    2 +-
 src/or/hs_cache.h                     |   24 +-
 src/or/hs_circuit.c                   |   12 +-
 src/or/hs_circuitmap.c                |    1 -
 src/or/hs_circuitmap.h                |    5 +-
 src/or/hs_client.c                    |    3 +-
 src/or/hs_common.c                    |    1 -
 src/or/hs_common.h                    |   34 +-
 src/or/hs_config.c                    |    3 +-
 src/or/hs_control.c                   |    2 +-
 src/or/hs_descriptor.c                |    3 +-
 src/or/hs_descriptor.h                |    4 -
 src/or/hs_intropoint.c                |    2 +-
 src/or/hs_ntor.c                      |    3 +-
 src/or/hs_ntor.h                      |   44 +-
 src/or/hs_service.c                   |   12 +-
 src/or/include.am                     |    5 +-
 src/or/main.c                         |    9 +
 src/or/main.h                         |    7 +-
 src/or/microdesc.c                    |    7 +
 src/or/microdesc_st.h                 |   13 +-
 src/or/networkstatus.c                |    6 +-
 src/or/networkstatus_st.h             |    8 +-
 src/or/node_st.h                      |    2 +-
 src/or/nodelist.h                     |   15 +-
 src/or/ntmain.c                       |    1 +
 src/or/onion.c                        |    6 +-
 src/or/onion.h                        |   11 +-
 src/or/onion_fast.c                   |    2 +-
 src/or/onion_ntor.c                   |    2 +-
 src/or/onion_ntor.h                   |   22 +-
 src/or/onion_tap.c                    |   20 +-
 src/or/onion_tap.h                    |   18 +-
 src/or/or.h                           | 2315 +--------------------------------
 src/or/or_connection_st.h             |    6 +-
 src/or/or_handshake_certs_st.h        |    9 +-
 src/or/or_options_st.h                | 1077 +++++++++++++++
 src/or/or_state_st.h                  |   86 ++
 src/or/origin_circuit_st.h            |   57 +-
 src/or/parsecommon.c                  |    2 +
 src/or/parsecommon.h                  |   11 +-
 src/or/periodic.c                     |    2 +-
 src/or/policies.c                     |    3 +-
 src/or/policies.h                     |   37 +-
 src/or/proto_ext_or.h                 |    9 +-
 src/or/proto_socks.c                  |    2 +-
 src/or/proto_socks.h                  |    1 -
 src/or/reasons.c                      |    3 +-
 src/or/reasons.h                      |    1 +
 src/or/relay_crypto.c                 |    2 +-
 src/or/relay_crypto_st.h              |   14 +-
 src/or/rend_intro_point_st.h          |   10 +-
 src/or/rendclient.c                   |    9 +-
 src/or/rendcommon.c                   |    2 +-
 src/or/rendmid.c                      |    4 +-
 src/or/rendservice.c                  |   29 +-
 src/or/rendservice.h                  |   10 +-
 src/or/rephist.c                      |    5 +
 src/or/replaycache.h                  |    5 +-
 src/or/router.c                       |    4 +
 src/or/router.h                       |   14 +-
 src/or/routerinfo_st.h                |    5 +-
 src/or/routerkeys.c                   |   11 +-
 src/or/routerlist.c                   |    6 +-
 src/or/routerlist.h                   |   85 +-
 src/or/routerparse.c                  |    5 +
 src/or/routerparse.h                  |   21 +-
 src/or/routerset.c                    |    1 +
 src/or/scheduler.c                    |    2 +-
 src/or/scheduler_kist.c               |    4 +
 src/or/socks_request_st.h             |   18 +-
 src/or/statefile.c                    |    8 +-
 src/or/statefile.h                    |    4 +-
 src/or/status.c                       |    3 +-
 src/or/torcert.c                      |    2 +-
 src/or/torcert.h                      |    9 +-
 src/or/transports.c                   |    1 +
 src/or/vote_routerstatus_st.h         |    2 +-
 src/test/bench.c                      |   13 +-
 src/test/fuzz/fuzz_consensus.c        |    3 +-
 src/test/fuzz/fuzz_hsdescv2.c         |    2 +-
 src/test/fuzz/fuzz_iptsv2.c           |    2 +-
 src/test/fuzz/fuzz_microdesc.c        |    3 +-
 src/test/fuzz/fuzz_vrs.c              |    2 +-
 src/test/fuzz/fuzzing_common.c        |    2 +-
 src/test/test.c                       |    6 +-
 src/test/test_accounting.c            |    3 +-
 src/test/test_addr.c                  |    5 +-
 src/test/test_bt_cl.c                 |    5 +-
 src/test/test_buffers.c               |    3 +-
 src/test/test_cell_formats.c          |    1 -
 src/test/test_channelpadding.c        |    4 +-
 src/test/test_channeltls.c            |    2 +-
 src/test/test_checkdir.c              |    5 +-
 src/test/test_circuitbuild.c          |    2 +-
 src/test/test_config.c                |    8 +
 src/test/test_conscache.c             |    2 +-
 src/test/test_consdiffmgr.c           |    3 +-
 src/test/test_controller.c            |    2 +-
 src/test/test_controller_events.c     |    2 +-
 src/test/test_crypto.c                |   93 +-
 src/test/test_crypto_slow.c           |    3 +-
 src/test/test_dir.c                   |    8 +
 src/test/test_dns.c                   |    2 +-
 src/test/test_entryconn.c             |    3 +-
 src/test/test_entrynodes.c            |    2 +
 src/test/test_extorport.c             |    5 +-
 src/test/test_helpers.c               |    2 +-
 src/test/test_hs.c                    |    6 +-
 src/test/test_hs_cache.c              |    2 +-
 src/test/test_hs_client.c             |   10 +-
 src/test/test_hs_common.c             |    3 +-
 src/test/test_hs_control.c            |    2 +-
 src/test/test_hs_descriptor.c         |    2 +-
 src/test/test_hs_ntor.c               |    3 +-
 src/test/test_hs_ntor_cl.c            |    3 +-
 src/test/test_hs_service.c            |    3 +-
 src/test/test_link_handshake.c        |    2 +
 src/test/test_logging.c               |    4 +
 src/test/test_microdesc.c             |    5 +-
 src/test/test_oos.c                   |    2 +-
 src/test/test_options.c               |    1 +
 src/test/test_policy.c                |    3 +-
 src/test/test_pt.c                    |    3 +
 src/test/test_relay.c                 |    2 +-
 src/test/test_routerkeys.c            |    9 +-
 src/test/test_routerlist.c            |    5 +-
 src/test/test_routerset.c             |    2 +-
 src/test/test_shared_random.c         |    6 +-
 src/test/test_socks.c                 |    1 +
 src/test/test_status.c                |    3 +-
 src/test/test_storagedir.c            |    2 +-
 src/test/test_switch_id.c             |    3 +
 src/test/test_tortls.c                |    1 +
 src/test/test_util.c                  |   13 +
 src/test/testing_common.c             |   10 +
 198 files changed, 3070 insertions(+), 2734 deletions(-)



More information about the tor-commits mailing list