[tor-commits] [tor/master] Merge branch 'split_or_directory'
nickm at torproject.org
nickm at torproject.org
Thu Jul 5 22:13:18 UTC 2018
commit 8b0920bb6f0d52402026d38dcc8405c0ff263dbb
Merge: 4eac5c6ce 50963f36d
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Jul 5 18:13:06 2018 -0400
Merge branch 'split_or_directory'
.gitignore | 19 +-
Doxyfile.in | 1156 ++++++++++----------
Makefile.am | 14 +-
configure.ac | 2 +-
contrib/include.am | 1 -
contrib/win32build/package_nsis-mingw.sh | 95 --
doc/HACKING/HelpfulTools.md | 6 +-
doc/HACKING/Module.md | 26 +-
doc/HACKING/Tracing.md | 2 +-
scripts/maint/checkOptionDocs.pl.in | 2 +-
scripts/maint/fallback.whitelist | 3 +-
scripts/maint/updateFallbackDirs.py | 8 +-
scripts/test/coverage | 2 +-
src/{or => app/config}/auth_dirs.inc | 0
src/{or => app/config}/config.c | 90 +-
src/{or => app/config}/config.h | 2 +-
src/{or => app/config}/confparse.c | 6 +-
src/{or => app/config}/confparse.h | 0
src/{or => app/config}/fallback_dirs.inc | 0
src/{or => app/config}/or_options_st.h | 0
src/{or => app/config}/or_state_st.h | 0
src/{or => app/config}/statefile.c | 26 +-
src/{or => app/config}/statefile.h | 0
src/app/include.am | 38 +
src/{or => app/main}/ntmain.c | 8 +-
src/{or => app/main}/ntmain.h | 0
src/{or => app/main}/tor_main.c | 0
src/{or => core/crypto}/hs_ntor.c | 4 +-
src/{or => core/crypto}/hs_ntor.h | 2 +-
src/{or => core/crypto}/onion.c | 34 +-
src/{or => core/crypto}/onion.h | 0
src/{or => core/crypto}/onion_fast.c | 4 +-
src/{or => core/crypto}/onion_fast.h | 0
src/{or => core/crypto}/onion_ntor.c | 2 +-
src/{or => core/crypto}/onion_ntor.h | 0
src/{or => core/crypto}/onion_tap.c | 8 +-
src/{or => core/crypto}/onion_tap.h | 0
src/{or => core/crypto}/relay_crypto.c | 18 +-
src/{or => core/crypto}/relay_crypto.h | 0
src/core/include.am | 326 ++++++
src/{or => core/mainloop}/connection.c | 90 +-
src/{or => core/mainloop}/connection.h | 0
src/{or => core/mainloop}/cpuworker.c | 24 +-
src/{or => core/mainloop}/cpuworker.h | 0
src/{or => core/mainloop}/main.c | 136 +--
src/{or => core/mainloop}/main.h | 2 +-
src/{or => core/mainloop}/periodic.c | 8 +-
src/{or => core/mainloop}/periodic.h | 0
src/{ => core}/or/addr_policy_st.h | 0
src/{ => core}/or/address_set.c | 2 +-
src/{ => core}/or/address_set.h | 0
src/{ => core}/or/cell_queue_st.h | 0
src/{ => core}/or/cell_st.h | 0
src/{ => core}/or/channel.c | 44 +-
src/{ => core}/or/channel.h | 4 +-
src/{ => core}/or/channelpadding.c | 28 +-
src/{ => core}/or/channelpadding.h | 0
src/{ => core}/or/channeltls.c | 56 +-
src/{ => core}/or/channeltls.h | 4 +-
src/{ => core}/or/circuit_st.h | 4 +-
src/{ => core}/or/circuitbuild.c | 92 +-
src/{ => core}/or/circuitbuild.h | 0
src/{ => core}/or/circuitlist.c | 76 +-
src/{ => core}/or/circuitlist.h | 2 +-
src/{ => core}/or/circuitmux.c | 18 +-
src/{ => core}/or/circuitmux.h | 2 +-
src/{ => core}/or/circuitmux_ewma.c | 10 +-
src/{ => core}/or/circuitmux_ewma.h | 4 +-
src/{ => core}/or/circuitstats.c | 34 +-
src/{ => core}/or/circuitstats.h | 0
src/{ => core}/or/circuituse.c | 72 +-
src/{ => core}/or/circuituse.h | 0
src/{ => core}/or/command.c | 46 +-
src/{ => core}/or/command.h | 2 +-
src/{ => core}/or/connection_edge.c | 92 +-
src/{ => core}/or/connection_edge.h | 0
src/{ => core}/or/connection_or.c | 78 +-
src/{ => core}/or/connection_or.h | 0
src/{ => core}/or/connection_st.h | 0
src/{ => core}/or/cpath_build_state_st.h | 0
src/{ => core}/or/crypt_path_reference_st.h | 0
src/{ => core}/or/crypt_path_st.h | 2 +-
src/{ => core}/or/destroy_cell_queue_st.h | 0
src/{ => core}/or/dos.c | 26 +-
src/{ => core}/or/dos.h | 0
src/{ => core}/or/edge_connection_st.h | 4 +-
src/{ => core}/or/entry_connection_st.h | 2 +-
src/{ => core}/or/entry_port_cfg_st.h | 2 +-
src/{ => core}/or/extend_info_st.h | 0
src/{ => core}/or/git_revision.c | 5 +-
src/{ => core}/or/git_revision.h | 0
src/{ => core}/or/listener_connection_st.h | 2 +-
src/{ => core}/or/or.h | 2 +-
src/{ => core}/or/or_circuit_st.h | 6 +-
src/{ => core}/or/or_connection_st.h | 2 +-
src/{ => core}/or/or_handshake_certs_st.h | 0
src/{ => core}/or/or_handshake_state_st.h | 0
src/{ => core}/or/origin_circuit_st.h | 4 +-
src/{ => core}/or/policies.c | 36 +-
src/{ => core}/or/policies.h | 0
src/{ => core}/or/port_cfg_st.h | 4 +-
src/{ => core}/or/protover.c | 6 +-
src/{ => core}/or/protover.h | 0
src/{ => core}/or/reasons.c | 8 +-
src/{ => core}/or/reasons.h | 0
src/{ => core}/or/relay.c | 84 +-
src/{ => core}/or/relay.h | 0
src/{ => core}/or/relay_crypto_st.h | 0
src/{ => core}/or/scheduler.c | 12 +-
src/{ => core}/or/scheduler.h | 4 +-
src/{ => core}/or/scheduler_kist.c | 16 +-
src/{ => core}/or/scheduler_vanilla.c | 8 +-
src/{ => core}/or/server_port_cfg_st.h | 0
src/{ => core}/or/socks_request_st.h | 0
src/{ => core}/or/status.c | 38 +-
src/{ => core}/or/status.h | 0
src/{ => core}/or/tor_version_st.h | 0
src/{ => core}/or/var_cell_st.h | 0
src/{or => core/proto}/proto_cell.c | 8 +-
src/{or => core/proto}/proto_cell.h | 0
src/{or => core/proto}/proto_control0.c | 4 +-
src/{or => core/proto}/proto_control0.h | 0
src/{or => core/proto}/proto_ext_or.c | 6 +-
src/{or => core/proto}/proto_ext_or.h | 0
src/{or => core/proto}/proto_http.c | 4 +-
src/{or => core/proto}/proto_http.h | 0
src/{or => core/proto}/proto_socks.c | 18 +-
src/{or => core/proto}/proto_socks.h | 0
src/{or => core/proto}/protover_rust.c | 4 +-
src/{or => feature/api}/tor_api.c | 4 +-
src/{or => feature/api}/tor_api.h | 0
src/{or => feature/api}/tor_api_internal.h | 0
src/{or => feature/client}/addressmap.c | 22 +-
src/{or => feature/client}/addressmap.h | 0
src/{or => feature/client}/bridges.c | 36 +-
src/{or => feature/client}/bridges.h | 0
src/{or => feature/client}/circpathbias.c | 34 +-
src/{or => feature/client}/circpathbias.h | 0
src/{or => feature/client}/dnsserv.c | 26 +-
src/{or => feature/client}/dnsserv.h | 0
src/{or => feature/client}/entrynodes.c | 56 +-
src/{or => feature/client}/entrynodes.h | 0
src/{or => feature/client}/transports.c | 22 +-
src/{or => feature/client}/transports.h | 0
src/{or => feature/control}/control.c | 116 +-
src/{or => feature/control}/control.h | 0
.../control}/control_connection_st.h | 4 +-
src/{or => feature}/dirauth/dircollate.c | 8 +-
src/{or => feature}/dirauth/dircollate.h | 2 +-
src/{or => feature}/dirauth/dirvote.c | 76 +-
src/{or => feature}/dirauth/dirvote.h | 0
src/{or => feature/dirauth}/keypin.c | 2 +-
src/{or => feature/dirauth}/keypin.h | 0
src/{or => feature}/dirauth/mode.h | 2 +-
.../dirauth}/ns_detached_signatures_st.h | 0
src/{or => feature}/dirauth/shared_random.c | 34 +-
src/{or => feature}/dirauth/shared_random.h | 2 +-
src/{or => feature}/dirauth/shared_random_state.c | 22 +-
src/{or => feature}/dirauth/shared_random_state.h | 2 +-
.../dirauth}/vote_microdesc_hash_st.h | 0
src/{or => feature/dircache}/cached_dir_st.h | 0
src/{or => feature/dircache}/conscache.c | 6 +-
src/{or => feature/dircache}/conscache.h | 0
src/{or => feature/dircache}/consdiffmgr.c | 20 +-
src/{or => feature/dircache}/consdiffmgr.h | 0
src/{or => feature/dircache}/directory.c | 92 +-
src/{or => feature/dircache}/directory.h | 2 +-
src/{or => feature/dircache}/dirserv.c | 80 +-
src/{or => feature/dircache}/dirserv.h | 0
src/{or => feature/dirclient}/dir_server_st.h | 4 +-
src/{or => feature/dirclient}/download_status_st.h | 0
src/{or => feature/dircommon}/consdiff.c | 6 +-
src/{or => feature/dircommon}/consdiff.h | 2 +-
src/{or => feature/dircommon}/dir_connection_st.h | 2 +-
src/{or => feature/dircommon}/fp_pair.c | 4 +-
src/{or => feature/dircommon}/fp_pair.h | 0
src/{or => feature/dircommon}/vote_timing_st.h | 0
src/{or => feature/dircommon}/voting_schedule.c | 10 +-
src/{or => feature/dircommon}/voting_schedule.h | 2 +-
src/{or => feature/hibernate}/hibernate.c | 28 +-
src/{or => feature/hibernate}/hibernate.h | 0
src/{or => feature/hs}/hs_cache.c | 20 +-
src/{or => feature/hs}/hs_cache.h | 8 +-
src/{or => feature/hs}/hs_cell.c | 14 +-
src/{or => feature/hs}/hs_cell.h | 4 +-
src/{or => feature/hs}/hs_circuit.c | 46 +-
src/{or => feature/hs}/hs_circuit.h | 4 +-
src/{or => feature/hs}/hs_circuitmap.c | 12 +-
src/{or => feature/hs}/hs_circuitmap.h | 0
src/{or => feature/hs}/hs_client.c | 60 +-
src/{or => feature/hs}/hs_client.h | 4 +-
src/{or => feature/hs}/hs_common.c | 48 +-
src/{or => feature/hs}/hs_common.h | 2 +-
src/{or => feature/hs}/hs_config.c | 10 +-
src/{or => feature/hs}/hs_config.h | 2 +-
src/{or => feature/hs}/hs_control.c | 20 +-
src/{or => feature/hs}/hs_control.h | 2 +-
src/{or => feature/hs}/hs_descriptor.c | 18 +-
src/{or => feature/hs}/hs_descriptor.h | 4 +-
src/{or => feature/hs}/hs_ident.c | 2 +-
src/{or => feature/hs}/hs_ident.h | 2 +-
src/{or => feature/hs}/hs_intropoint.c | 24 +-
src/{or => feature/hs}/hs_intropoint.h | 2 +-
src/{or => feature/hs}/hs_service.c | 74 +-
src/{or => feature/hs}/hs_service.h | 10 +-
src/{or => feature/hs}/hs_stats.c | 6 +-
src/{or => feature/hs}/hs_stats.h | 0
src/{or => feature/hs}/hsdir_index_st.h | 0
src/{or => feature/hs_common}/replaycache.c | 4 +-
src/{or => feature/hs_common}/replaycache.h | 0
.../hs_common}/shared_random_client.c | 10 +-
.../hs_common}/shared_random_client.h | 2 +-
src/{or => feature/nodelist}/authority_cert_st.h | 2 +-
src/{or => feature/nodelist}/desc_store_st.h | 0
.../nodelist}/document_signature_st.h | 0
src/{or => feature/nodelist}/extrainfo_st.h | 2 +-
src/{or => feature/nodelist}/microdesc.c | 36 +-
src/{or => feature/nodelist}/microdesc.h | 0
src/{or => feature/nodelist}/microdesc_st.h | 0
src/{or => feature/nodelist}/networkstatus.c | 96 +-
src/{or => feature/nodelist}/networkstatus.h | 0
.../nodelist}/networkstatus_sr_info_st.h | 0
src/{or => feature/nodelist}/networkstatus_st.h | 2 +-
.../nodelist}/networkstatus_voter_info_st.h | 0
src/{or => feature/nodelist}/node_st.h | 2 +-
src/{or => feature/nodelist}/nodelist.c | 60 +-
src/{or => feature/nodelist}/nodelist.h | 0
src/{or => feature/nodelist}/parsecommon.c | 2 +-
src/{or => feature/nodelist}/parsecommon.h | 0
src/{or => feature/nodelist}/routerinfo_st.h | 2 +-
src/{or => feature/nodelist}/routerlist.c | 80 +-
src/{or => feature/nodelist}/routerlist.h | 0
src/{or => feature/nodelist}/routerlist_st.h | 2 +-
src/{or => feature/nodelist}/routerparse.c | 80 +-
src/{or => feature/nodelist}/routerparse.h | 0
src/{or => feature/nodelist}/routerset.c | 28 +-
src/{or => feature/nodelist}/routerset.h | 0
src/{or => feature/nodelist}/routerstatus_st.h | 2 +-
.../nodelist}/signed_descriptor_st.h | 2 +-
src/{or => feature/nodelist}/torcert.c | 8 +-
src/{or => feature/nodelist}/torcert.h | 0
.../nodelist}/vote_routerstatus_st.h | 2 +-
src/{or => feature/relay}/dns.c | 28 +-
src/{or => feature/relay}/dns.h | 2 +-
src/{or => feature/relay}/dns_structs.h | 0
src/{or => feature/relay}/ext_orport.c | 18 +-
src/{or => feature/relay}/ext_orport.h | 0
src/{or => feature/relay}/router.c | 82 +-
src/{or => feature/relay}/router.h | 0
src/{or => feature/relay}/routerkeys.c | 10 +-
src/{or => feature/relay}/routerkeys.h | 0
.../rend}/rend_authorized_client_st.h | 0
.../rend}/rend_encoded_v2_service_descriptor_st.h | 0
src/{or => feature/rend}/rend_intro_point_st.h | 0
.../rend}/rend_service_descriptor_st.h | 0
src/{or => feature/rend}/rendcache.c | 18 +-
src/{or => feature/rend}/rendcache.h | 4 +-
src/{or => feature/rend}/rendclient.c | 64 +-
src/{or => feature/rend}/rendclient.h | 2 +-
src/{or => feature/rend}/rendcommon.c | 58 +-
src/{or => feature/rend}/rendcommon.h | 0
src/{or => feature/rend}/rendmid.c | 26 +-
src/{or => feature/rend}/rendmid.h | 0
src/{or => feature/rend}/rendservice.c | 72 +-
src/{or => feature/rend}/rendservice.h | 4 +-
src/{or => feature/stats}/geoip.c | 14 +-
src/{or => feature/stats}/geoip.h | 2 +-
src/{or => feature/stats}/rephist.c | 30 +-
src/{or => feature/stats}/rephist.h | 0
src/include.am | 5 +-
src/or/Makefile.nmake | 79 --
src/or/include.am | 370 -------
src/rust/external/external.rs | 2 +-
src/rust/protover/ffi.rs | 4 +-
src/rust/protover/protover.rs | 12 +-
src/rust/tor_log/tor_log.rs | 2 +-
src/test/bench.c | 18 +-
src/test/fuzz/fuzz_consensus.c | 8 +-
src/test/fuzz/fuzz_descriptor.c | 8 +-
src/test/fuzz/fuzz_diff.c | 4 +-
src/test/fuzz/fuzz_diff_apply.c | 4 +-
src/test/fuzz/fuzz_extrainfo.c | 8 +-
src/test/fuzz/fuzz_hsdescv2.c | 6 +-
src/test/fuzz/fuzz_hsdescv3.c | 6 +-
src/test/fuzz/fuzz_http.c | 10 +-
src/test/fuzz/fuzz_http_connect.c | 14 +-
src/test/fuzz/fuzz_iptsv2.c | 8 +-
src/test/fuzz/fuzz_microdesc.c | 6 +-
src/test/fuzz/fuzz_vrs.c | 12 +-
src/test/fuzz/fuzzing_common.c | 4 +-
src/test/hs_test_helpers.c | 6 +-
src/test/hs_test_helpers.h | 2 +-
src/test/log_test_helpers.h | 2 +-
src/test/rend_test_helpers.c | 10 +-
src/test/rend_test_helpers.h | 2 +-
src/test/test-network.sh | 4 +-
src/test/test.c | 44 +-
src/test/test_accounting.c | 10 +-
src/test/test_addr.c | 4 +-
src/test/test_address.c | 2 +-
src/test/test_address_set.c | 24 +-
src/test/test_bridges.c | 11 +-
src/test/test_bt_cl.c | 2 +-
src/test/test_buffers.c | 6 +-
src/test/test_bwmgt.c | 2 +-
src/test/test_cell_formats.c | 28 +-
src/test/test_cell_queue.c | 14 +-
src/test/test_channel.c | 30 +-
src/test/test_channelpadding.c | 26 +-
src/test/test_channeltls.c | 16 +-
src/test/test_checkdir.c | 4 +-
src/test/test_circuitbuild.c | 10 +-
src/test/test_circuitlist.c | 16 +-
src/test/test_circuitmux.c | 14 +-
src/test/test_circuitstats.c | 24 +-
src/test/test_circuituse.c | 18 +-
src/test/test_compat_libevent.c | 2 +-
src/test/test_config.c | 68 +-
src/test/test_connection.c | 34 +-
src/test/test_conscache.c | 6 +-
src/test/test_consdiff.c | 4 +-
src/test/test_consdiffmgr.c | 18 +-
src/test/test_containers.c | 4 +-
src/test/test_controller.c | 26 +-
src/test/test_controller_events.c | 16 +-
src/test/test_crypto.c | 2 +-
src/test/test_crypto_slow.c | 2 +-
src/test/test_dir.c | 70 +-
src/test/test_dir_common.c | 22 +-
src/test/test_dir_common.h | 6 +-
src/test/test_dir_handle_get.c | 52 +-
src/test/test_dns.c | 14 +-
src/test/test_dos.c | 26 +-
src/test/test_entryconn.c | 22 +-
src/test/test_entrynodes.c | 52 +-
src/test/test_extorport.c | 16 +-
src/test/test_geoip.c | 6 +-
src/test/test_guardfraction.c | 20 +-
src/test/test_helpers.c | 28 +-
src/test/test_helpers.h | 2 +-
src/test/test_hs.c | 28 +-
src/test/test_hs_cache.c | 16 +-
src/test/test_hs_cell.c | 6 +-
src/test/test_hs_client.c | 52 +-
src/test/test_hs_common.c | 42 +-
src/test/test_hs_config.c | 10 +-
src/test/test_hs_control.c | 18 +-
src/test/test_hs_descriptor.c | 6 +-
src/test/test_hs_intropoint.c | 22 +-
src/test/test_hs_ntor.c | 2 +-
src/test/test_hs_ntor_cl.c | 6 +-
src/test/test_hs_service.c | 64 +-
src/test/test_introduce.c | 4 +-
src/test/test_keypin.c | 4 +-
src/test/test_link_handshake.c | 28 +-
src/test/test_logging.c | 4 +-
src/test/test_mainloop.c | 4 +-
src/test/test_microdesc.c | 26 +-
src/test/test_nodelist.c | 20 +-
src/test/test_ntor_cl.c | 4 +-
src/test/test_oom.c | 18 +-
src/test/test_oos.c | 16 +-
src/test/test_options.c | 14 +-
src/test/test_periodic_event.c | 12 +-
src/test/test_policy.c | 20 +-
src/test/test_procmon.c | 2 +-
src/test/test_proto_http.c | 4 +-
src/test/test_proto_misc.c | 14 +-
src/test/test_protover.c | 6 +-
src/test/test_pt.c | 16 +-
src/test/test_relay.c | 14 +-
src/test/test_relaycell.c | 26 +-
src/test/test_relaycrypt.c | 16 +-
src/test/test_rendcache.c | 24 +-
src/test/test_replay.c | 4 +-
src/test/test_router.c | 13 +-
src/test/test_routerkeys.c | 10 +-
src/test/test_routerlist.c | 50 +-
src/test/test_routerset.c | 24 +-
src/test/test_scheduler.c | 14 +-
src/test/test_shared_random.c | 32 +-
src/test/test_slow.c | 2 +-
src/test/test_socks.c | 10 +-
src/test/test_status.c | 28 +-
src/test/test_storagedir.c | 2 +-
src/test/test_switch_id.c | 2 +-
src/test/test_threads.c | 2 +-
src/test/test_tortls.c | 6 +-
src/test/test_util.c | 8 +-
src/test/test_util_format.c | 2 +-
src/test/test_util_process.c | 2 +-
src/test/test_voting_schedule.c | 4 +-
src/test/test_workqueue.c | 4 +-
src/test/test_zero_length_keys.sh | 6 +-
src/test/testing_common.c | 12 +-
src/test/testing_rsakeys.c | 2 +-
src/tools/include.am | 4 +-
src/tools/tor_runner.c | 4 +-
398 files changed, 3606 insertions(+), 3783 deletions(-)
More information about the tor-commits
mailing list