[tor-commits] [tor/master] Merge branch 'split_or_h'
nickm at torproject.org
nickm at torproject.org
Mon Jun 18 18:18:43 UTC 2018
commit 104c2e9e7e3a61924cdc4d5729c03932712fc1e3
Merge: bcc1368c7 3edc48c07
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Jun 18 14:18:34 2018 -0400
Merge branch 'split_or_h'
changes/split_or_h | 5 +
src/or/addressmap.c | 2 +
src/or/authority_cert_st.h | 32 +
src/or/bridges.c | 5 +
src/or/cached_dir_st.h | 25 +
src/or/cell_queue_st.h | 28 +
src/or/cell_st.h | 20 +
src/or/channel.c | 2 +
src/or/channelpadding.c | 3 +
src/or/channeltls.c | 9 +
src/or/circpathbias.c | 6 +
src/or/circuit_st.h | 172 ++
src/or/circuitbuild.c | 11 +
src/or/circuitlist.c | 34 +
src/or/circuitlist.h | 9 +
src/or/circuitmux.c | 4 +
src/or/circuitstats.c | 3 +
src/or/circuitstats.h | 15 +
src/or/circuituse.c | 9 +
src/or/command.c | 5 +
src/or/config.c | 3 +
src/or/connection.c | 51 +
src/or/connection.h | 47 +-
src/or/connection_edge.c | 34 +
src/or/connection_edge.h | 6 +-
src/or/connection_or.c | 17 +
src/or/connection_or.h | 2 +
src/or/connection_st.h | 132 ++
src/or/consdiffmgr.c | 3 +
src/or/control.c | 27 +
src/or/control.h | 2 +
src/or/control_connection_st.h | 46 +
src/or/cpath_build_state_st.h | 38 +
src/or/cpuworker.c | 2 +
src/or/crypt_path_reference_st.h | 23 +
src/or/crypt_path_st.h | 56 +
src/or/desc_store_st.h | 34 +
src/or/destroy_cell_queue_st.h | 27 +
src/or/dir_connection_st.h | 66 +
src/or/dir_server_st.h | 55 +
src/or/dirauth/dircollate.c | 3 +
src/or/dirauth/dirvote.c | 15 +
src/or/dirauth/shared_random.c | 3 +
src/or/directory.c | 41 +
src/or/directory.h | 27 +-
src/or/dirserv.c | 10 +
src/or/dirserv.h | 8 +
src/or/dns.c | 4 +
src/or/dnsserv.c | 6 +
src/or/document_signature_st.h | 29 +
src/or/dos.c | 3 +
src/or/download_status_st.h | 65 +
src/or/edge_connection_st.h | 77 +
src/or/entry_connection_st.h | 100 +
src/or/entry_port_cfg_st.h | 54 +
src/or/entrynodes.c | 3 +
src/or/ext_orport.c | 2 +
src/or/extend_info_st.h | 28 +
src/or/extrainfo_st.h | 30 +
src/or/fp_pair.h | 6 +
src/or/hibernate.c | 2 +
src/or/hs_cache.c | 2 +
src/or/hs_cell.c | 2 +
src/or/hs_circuit.c | 5 +
src/or/hs_circuitmap.c | 3 +
src/or/hs_client.c | 6 +
src/or/hs_common.c | 6 +
src/or/hs_control.c | 3 +
src/or/hs_descriptor.c | 2 +
src/or/hs_intropoint.c | 2 +
src/or/hs_service.c | 8 +
src/or/hsdir_index_st.h | 24 +
src/or/include.am | 53 +-
src/or/listener_connection_st.h | 25 +
src/or/main.c | 8 +
src/or/microdesc.c | 5 +
src/or/microdesc_st.h | 71 +
src/or/networkstatus.c | 13 +
src/or/networkstatus_sr_info_st.h | 23 +
src/or/networkstatus_st.h | 95 +
src/or/networkstatus_voter_info_st.h | 31 +
src/or/node_st.h | 102 ++
src/or/nodelist.c | 17 +
src/or/nodelist.h | 1 +
src/or/ns_detached_signatures_st.h | 22 +
src/or/onion.c | 4 +
src/or/or.h | 2315 +-----------------------
src/or/or_circuit_st.h | 80 +
src/or/or_connection_st.h | 90 +
src/or/or_handshake_certs_st.h | 39 +
src/or/or_handshake_state_st.h | 78 +
src/or/origin_circuit_st.h | 235 +++
src/or/policies.c | 7 +
src/or/port_cfg_st.h | 35 +
src/or/proto_cell.c | 2 +
src/or/proto_socks.c | 2 +
src/or/relay.c | 13 +
src/or/relay_crypto.c | 5 +
src/or/relay_crypto_st.h | 27 +
src/or/rend_authorized_client_st.h | 18 +
src/or/rend_encoded_v2_service_descriptor_st.h | 17 +
src/or/rend_intro_point_st.h | 74 +
src/or/rend_service_descriptor_st.h | 34 +
src/or/rendcache.c | 4 +
src/or/rendclient.c | 10 +
src/or/rendcommon.c | 11 +
src/or/rendmid.c | 2 +
src/or/rendservice.c | 13 +
src/or/rephist.c | 3 +
src/or/router.c | 11 +
src/or/routerinfo_st.h | 107 ++
src/or/routerlist.c | 12 +
src/or/routerlist_st.h | 40 +
src/or/routerparse.c | 21 +-
src/or/routerparse.h | 1 +
src/or/routerset.c | 5 +
src/or/routerstatus_st.h | 80 +
src/or/scheduler.c | 2 +
src/or/scheduler_kist.c | 2 +
src/or/server_port_cfg_st.h | 20 +
src/or/shared_random_client.c | 2 +
src/or/signed_descriptor_st.h | 61 +
src/or/socks_request_st.h | 59 +
src/or/status.c | 2 +
src/or/tor_version_st.h | 32 +
src/or/torcert.c | 2 +
src/or/var_cell_st.h | 23 +
src/or/vote_microdesc_hash_st.h | 22 +
src/or/vote_routerstatus_st.h | 41 +
src/or/vote_timing_st.h | 24 +
src/or/voting_schedule.c | 2 +
src/test/bench.c | 3 +
src/test/fuzz/fuzz_http.c | 2 +
src/test/fuzz/fuzz_http_connect.c | 3 +
src/test/fuzz/fuzz_iptsv2.c | 3 +
src/test/fuzz/fuzz_vrs.c | 4 +
src/test/rend_test_helpers.c | 4 +
src/test/test.c | 6 +
src/test/test_address_set.c | 5 +
src/test/test_cell_formats.c | 5 +
src/test/test_cell_queue.c | 5 +
src/test/test_channel.c | 6 +
src/test/test_channelpadding.c | 5 +
src/test/test_channeltls.c | 2 +
src/test/test_circuitbuild.c | 2 +
src/test/test_circuitlist.c | 3 +
src/test/test_circuitmux.c | 2 +
src/test/test_circuitstats.c | 5 +
src/test/test_circuituse.c | 3 +
src/test/test_config.c | 4 +
src/test/test_connection.c | 8 +
src/test/test_consdiffmgr.c | 2 +
src/test/test_controller.c | 3 +
src/test/test_controller_events.c | 3 +
src/test/test_dir.c | 14 +
src/test/test_dir_common.c | 7 +
src/test/test_dir_handle_get.c | 7 +
src/test/test_dns.c | 3 +
src/test/test_dos.c | 5 +
src/test/test_entryconn.c | 3 +
src/test/test_entrynodes.c | 10 +
src/test/test_extorport.c | 3 +
src/test/test_guardfraction.c | 4 +
src/test/test_helpers.c | 6 +
src/test/test_hs.c | 6 +
src/test/test_hs_cache.c | 3 +
src/test/test_hs_client.c | 9 +
src/test/test_hs_common.c | 6 +
src/test/test_hs_control.c | 12 +-
src/test/test_hs_intropoint.c | 2 +
src/test/test_hs_service.c | 7 +
src/test/test_link_handshake.c | 5 +
src/test/test_microdesc.c | 5 +
src/test/test_nodelist.c | 7 +
src/test/test_oom.c | 5 +
src/test/test_oos.c | 3 +
src/test/test_policy.c | 5 +
src/test/test_proto_misc.c | 2 +
src/test/test_relay.c | 3 +
src/test/test_relaycell.c | 6 +
src/test/test_relaycrypt.c | 5 +
src/test/test_rendcache.c | 7 +
src/test/test_router.c | 2 +
src/test/test_routerlist.c | 7 +
src/test/test_routerset.c | 6 +
src/test/test_shared_random.c | 3 +
src/test/test_socks.c | 1 +
src/test/test_status.c | 4 +
188 files changed, 3742 insertions(+), 2333 deletions(-)
More information about the tor-commits
mailing list