[tor-commits] [tor/master] Merge branch 'tor-github/pr/1476'

dgoulet at torproject.org dgoulet at torproject.org
Mon Oct 28 12:51:12 UTC 2019


commit b98631d28082fd17a7568d693ebe97b4986fce56
Merge: 25d66a339 bc4b9d7df
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Oct 28 08:47:57 2019 -0400

    Merge branch 'tor-github/pr/1476'

 changes/ticket32307                                      | 4 ++++
 src/app/config/quiet_level.c                             | 5 +++++
 src/app/main/subsysmgr.c                                 | 8 ++++++++
 src/app/main/subsysmgr.h                                 | 5 +++++
 src/app/main/subsystem_list.c                            | 5 +++++
 src/core/crypto/hs_ntor.h                                | 5 +++++
 src/core/crypto/onion_ntor.h                             | 5 +++++
 src/core/crypto/relay_crypto.c                           | 5 +++++
 src/core/mainloop/mainloop_pubsub.c                      | 9 +++++++++
 src/core/mainloop/mainloop_pubsub.h                      | 5 +++++
 src/core/mainloop/mainloop_sys.c                         | 5 +++++
 src/core/mainloop/mainloop_sys.h                         | 5 +++++
 src/core/mainloop/netstatus.c                            | 5 +++++
 src/core/mainloop/netstatus.h                            | 5 +++++
 src/core/mainloop/periodic.h                             | 5 +++++
 src/core/or/addr_policy_st.h                             | 5 +++++
 src/core/or/cell_queue_st.h                              | 5 +++++
 src/core/or/cell_st.h                                    | 6 +++++-
 src/core/or/channelpadding.c                             | 5 +++++
 src/core/or/circuit_st.h                                 | 5 +++++
 src/core/or/connection_st.h                              | 5 +++++
 src/core/or/cpath_build_state_st.h                       | 6 +++++-
 src/core/or/crypt_path_reference_st.h                    | 6 +++++-
 src/core/or/crypt_path_st.h                              | 5 +++++
 src/core/or/destroy_cell_queue_st.h                      | 6 +++++-
 src/core/or/edge_connection_st.h                         | 6 +++++-
 src/core/or/entry_connection_st.h                        | 6 +++++-
 src/core/or/entry_port_cfg_st.h                          | 6 +++++-
 src/core/or/extend_info_st.h                             | 5 +++++
 src/core/or/half_edge_st.h                               | 6 +++++-
 src/core/or/listener_connection_st.h                     | 6 +++++-
 src/core/or/or_connection_st.h                           | 5 +++++
 src/core/or/or_handshake_certs_st.h                      | 5 +++++
 src/core/or/or_handshake_state_st.h                      | 6 +++++-
 src/core/or/origin_circuit_st.h                          | 5 +++++
 src/core/or/port_cfg_st.h                                | 6 +++++-
 src/core/or/relay_crypto_st.h                            | 5 +++++
 src/core/or/scheduler_kist.c                             | 5 +++++
 src/core/or/scheduler_vanilla.c                          | 6 +++++-
 src/core/or/server_port_cfg_st.h                         | 6 +++++-
 src/core/or/socks_request_st.h                           | 5 +++++
 src/core/or/status.h                                     | 6 +++++-
 src/core/or/tor_version_st.h                             | 6 +++++-
 src/core/or/var_cell_st.h                                | 6 +++++-
 src/core/proto/proto_cell.c                              | 8 +++++++-
 src/core/proto/proto_cell.h                              | 6 +++++-
 src/core/proto/proto_control0.c                          | 6 +++++-
 src/core/proto/proto_control0.h                          | 6 +++++-
 src/core/proto/proto_ext_or.c                            | 6 +++++-
 src/core/proto/proto_ext_or.h                            | 5 +++++
 src/core/proto/proto_http.c                              | 6 +++++-
 src/core/proto/proto_http.h                              | 6 +++++-
 src/core/proto/proto_socks.c                             | 7 ++++++-
 src/core/proto/proto_socks.h                             | 5 +++++
 src/feature/api/tor_api_internal.h                       | 5 +++++
 src/feature/client/addressmap.h                          | 6 +++++-
 src/feature/client/proxymode.c                           | 5 +++++
 src/feature/control/control_connection_st.h              | 5 +++++
 src/feature/control/fmt_serverstatus.c                   | 5 +++++
 src/feature/control/getinfo_geoip.c                      | 9 +++++++++
 src/feature/control/getinfo_geoip.h                      | 5 +++++
 src/feature/dirauth/bridgeauth.c                         | 5 +++++
 src/feature/dirauth/bridgeauth.h                         | 5 +++++
 src/feature/dirauth/dirauth_periodic.c                   | 5 +++++
 src/feature/dirauth/dirauth_periodic.h                   | 5 +++++
 src/feature/dirauth/dirauth_sys.c                        | 5 +++++
 src/feature/dirauth/dirauth_sys.h                        | 5 +++++
 src/feature/dirauth/keypin.h                             | 5 +++++
 src/feature/dirauth/ns_detached_signatures_st.h          | 6 +++++-
 src/feature/dirauth/shared_random_state.h                | 5 +++++
 src/feature/dirauth/vote_microdesc_hash_st.h             | 6 +++++-
 src/feature/dircache/cached_dir_st.h                     | 6 +++++-
 src/feature/dircache/conscache.c                         | 7 ++++++-
 src/feature/dircache/conscache.h                         | 5 +++++
 src/feature/dircache/consdiffmgr.h                       | 5 +++++
 src/feature/dircache/dircache.c                          | 9 +++++++--
 src/feature/dirclient/dir_server_st.h                    | 5 +++++
 src/feature/dirclient/dirclient.c                        | 5 +++++
 src/feature/dirclient/dlstatus.c                         | 5 +++++
 src/feature/dirclient/download_status_st.h               | 6 +++++-
 src/feature/dircommon/consdiff.h                         | 5 +++++
 src/feature/dircommon/dir_connection_st.h                | 5 +++++
 src/feature/dircommon/vote_timing_st.h                   | 6 +++++-
 src/feature/dirparse/authcert_parse.c                    | 5 +++++
 src/feature/dirparse/unparseable.c                       | 5 +++++
 src/feature/hs/hsdir_index_st.h                          | 6 +++++-
 src/feature/nodelist/authority_cert_st.h                 | 6 +++++-
 src/feature/nodelist/desc_store_st.h                     | 5 +++++
 src/feature/nodelist/document_signature_st.h             | 6 +++++-
 src/feature/nodelist/extrainfo_st.h                      | 6 +++++-
 src/feature/nodelist/microdesc_st.h                      | 5 +++++
 src/feature/nodelist/networkstatus_sr_info_st.h          | 6 +++++-
 src/feature/nodelist/networkstatus_st.h                  | 5 +++++
 src/feature/nodelist/networkstatus_voter_info_st.h       | 5 +++++
 src/feature/nodelist/node_st.h                           | 5 +++++
 src/feature/nodelist/nodefamily_st.h                     | 5 +++++
 src/feature/nodelist/routerinfo.c                        | 5 +++++
 src/feature/nodelist/routerinfo_st.h                     | 5 +++++
 src/feature/nodelist/routerlist_st.h                     | 6 +++++-
 src/feature/nodelist/routerstatus_st.h                   | 6 +++++-
 src/feature/nodelist/signed_descriptor_st.h              | 6 +++++-
 src/feature/nodelist/torcert.h                           | 5 +++++
 src/feature/nodelist/vote_routerstatus_st.h              | 4 ++++
 src/feature/relay/ext_orport.h                           | 5 +++++
 src/feature/relay/routerkeys.h                           | 5 +++++
 src/feature/relay/routermode.c                           | 5 +++++
 src/feature/rend/rend_authorized_client_st.h             | 6 +++++-
 src/feature/rend/rend_encoded_v2_service_descriptor_st.h | 6 +++++-
 src/feature/rend/rend_intro_point_st.h                   | 5 +++++
 src/feature/rend/rend_service_descriptor_st.h            | 6 +++++-
 src/lib/container/namemap.c                              | 5 +++++
 src/lib/container/namemap_st.h                           | 5 +++++
 src/lib/crypt_ops/crypto_ope.c                           | 5 +++--
 src/lib/crypt_ops/crypto_ope.h                           | 5 +++++
 src/lib/dispatch/dispatch_cfg.h                          | 5 +++++
 src/lib/dispatch/dispatch_cfg_st.h                       | 5 +++++
 src/lib/dispatch/dispatch_naming.c                       | 5 +++++
 src/lib/dispatch/dispatch_naming.h                       | 5 +++++
 src/lib/geoip/country.h                                  | 5 +++++
 src/lib/net/socketpair.c                                 | 5 +++++
 src/lib/net/socketpair.h                                 | 5 +++++
 src/lib/pubsub/pubsub_publish.h                          | 5 +++++
 src/lib/subsys/subsys.h                                  | 5 +++++
 src/lib/tls/tortls.c                                     | 5 +++++
 src/lib/tls/tortls_internal.h                            | 5 +++++
 src/lib/tls/tortls_st.h                                  | 8 ++++++++
 src/lib/version/git_revision.c                           | 5 +++++
 src/lib/version/git_revision.h                           | 5 +++++
 src/lib/version/torversion.h                             | 5 +++++
 src/lib/version/version.c                                | 5 +++++
 130 files changed, 666 insertions(+), 46 deletions(-)



More information about the tor-commits mailing list