[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

nickm at torproject.org nickm at torproject.org
Wed Jan 16 17:36:01 UTC 2019


commit d51de6027f71d9180caf410802936bafc154d52b
Merge: ade9204fc efe55b889
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 16 12:35:56 2019 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 LICENSE                                                  | 2 +-
 Makefile.am                                              | 2 +-
 acinclude.m4                                             | 2 +-
 configure.ac                                             | 2 +-
 scripts/codegen/gen_server_ciphers.py                    | 2 +-
 scripts/codegen/get_mozilla_ciphers.py                   | 2 +-
 scripts/codegen/makedesc.py                              | 2 +-
 scripts/maint/annotate_ifdef_directives                  | 2 +-
 scripts/maint/format_changelog.py                        | 2 +-
 scripts/maint/redox.py                                   | 2 +-
 scripts/maint/sortChanges.py                             | 2 +-
 src/app/config/config.c                                  | 4 ++--
 src/app/config/config.h                                  | 2 +-
 src/app/config/confparse.c                               | 2 +-
 src/app/config/confparse.h                               | 2 +-
 src/app/config/or_options_st.h                           | 2 +-
 src/app/config/or_state_st.h                             | 2 +-
 src/app/config/statefile.c                               | 2 +-
 src/app/config/statefile.h                               | 2 +-
 src/app/main/main.c                                      | 2 +-
 src/app/main/main.h                                      | 2 +-
 src/app/main/ntmain.c                                    | 2 +-
 src/app/main/ntmain.h                                    | 2 +-
 src/app/main/tor_main.c                                  | 2 +-
 src/core/crypto/hs_ntor.c                                | 2 +-
 src/core/crypto/hs_ntor.h                                | 2 +-
 src/core/crypto/onion_crypto.c                           | 2 +-
 src/core/crypto/onion_crypto.h                           | 2 +-
 src/core/crypto/onion_fast.c                             | 2 +-
 src/core/crypto/onion_fast.h                             | 2 +-
 src/core/crypto/onion_ntor.c                             | 2 +-
 src/core/crypto/onion_ntor.h                             | 2 +-
 src/core/crypto/onion_tap.c                              | 2 +-
 src/core/crypto/onion_tap.h                              | 2 +-
 src/core/crypto/relay_crypto.c                           | 2 +-
 src/core/crypto/relay_crypto.h                           | 2 +-
 src/core/mainloop/connection.c                           | 2 +-
 src/core/mainloop/connection.h                           | 2 +-
 src/core/mainloop/cpuworker.c                            | 2 +-
 src/core/mainloop/cpuworker.h                            | 2 +-
 src/core/mainloop/mainloop.c                             | 2 +-
 src/core/mainloop/mainloop.h                             | 2 +-
 src/core/mainloop/netstatus.c                            | 2 +-
 src/core/mainloop/netstatus.h                            | 2 +-
 src/core/mainloop/periodic.c                             | 2 +-
 src/core/mainloop/periodic.h                             | 2 +-
 src/core/or/addr_policy_st.h                             | 2 +-
 src/core/or/address_set.c                                | 2 +-
 src/core/or/address_set.h                                | 2 +-
 src/core/or/cell_queue_st.h                              | 2 +-
 src/core/or/cell_st.h                                    | 2 +-
 src/core/or/channel.c                                    | 2 +-
 src/core/or/channel.h                                    | 2 +-
 src/core/or/channelpadding.c                             | 2 +-
 src/core/or/channelpadding.h                             | 2 +-
 src/core/or/channeltls.c                                 | 2 +-
 src/core/or/channeltls.h                                 | 2 +-
 src/core/or/circuit_st.h                                 | 2 +-
 src/core/or/circuitbuild.c                               | 2 +-
 src/core/or/circuitbuild.h                               | 2 +-
 src/core/or/circuitlist.c                                | 2 +-
 src/core/or/circuitlist.h                                | 2 +-
 src/core/or/circuitmux.c                                 | 2 +-
 src/core/or/circuitmux.h                                 | 2 +-
 src/core/or/circuitmux_ewma.c                            | 2 +-
 src/core/or/circuitmux_ewma.h                            | 2 +-
 src/core/or/circuitstats.c                               | 2 +-
 src/core/or/circuitstats.h                               | 2 +-
 src/core/or/circuituse.c                                 | 2 +-
 src/core/or/circuituse.h                                 | 2 +-
 src/core/or/command.c                                    | 2 +-
 src/core/or/command.h                                    | 2 +-
 src/core/or/connection_edge.c                            | 2 +-
 src/core/or/connection_edge.h                            | 2 +-
 src/core/or/connection_or.c                              | 2 +-
 src/core/or/connection_or.h                              | 2 +-
 src/core/or/connection_st.h                              | 2 +-
 src/core/or/cpath_build_state_st.h                       | 2 +-
 src/core/or/crypt_path_reference_st.h                    | 2 +-
 src/core/or/crypt_path_st.h                              | 2 +-
 src/core/or/destroy_cell_queue_st.h                      | 2 +-
 src/core/or/dos.c                                        | 2 +-
 src/core/or/dos.h                                        | 2 +-
 src/core/or/edge_connection_st.h                         | 2 +-
 src/core/or/entry_connection_st.h                        | 2 +-
 src/core/or/entry_port_cfg_st.h                          | 2 +-
 src/core/or/extend_info_st.h                             | 2 +-
 src/core/or/half_edge_st.h                               | 2 +-
 src/core/or/listener_connection_st.h                     | 2 +-
 src/core/or/onion.c                                      | 2 +-
 src/core/or/onion.h                                      | 2 +-
 src/core/or/or.h                                         | 2 +-
 src/core/or/or_circuit_st.h                              | 2 +-
 src/core/or/or_connection_st.h                           | 2 +-
 src/core/or/or_handshake_certs_st.h                      | 2 +-
 src/core/or/or_handshake_state_st.h                      | 2 +-
 src/core/or/origin_circuit_st.h                          | 2 +-
 src/core/or/policies.c                                   | 2 +-
 src/core/or/policies.h                                   | 2 +-
 src/core/or/port_cfg_st.h                                | 2 +-
 src/core/or/protover.c                                   | 2 +-
 src/core/or/protover.h                                   | 2 +-
 src/core/or/protover_rust.c                              | 2 +-
 src/core/or/reasons.c                                    | 2 +-
 src/core/or/reasons.h                                    | 2 +-
 src/core/or/relay.c                                      | 2 +-
 src/core/or/relay.h                                      | 2 +-
 src/core/or/relay_crypto_st.h                            | 2 +-
 src/core/or/scheduler.c                                  | 2 +-
 src/core/or/scheduler.h                                  | 2 +-
 src/core/or/scheduler_kist.c                             | 2 +-
 src/core/or/scheduler_vanilla.c                          | 2 +-
 src/core/or/server_port_cfg_st.h                         | 2 +-
 src/core/or/socks_request_st.h                           | 2 +-
 src/core/or/status.c                                     | 2 +-
 src/core/or/status.h                                     | 2 +-
 src/core/or/tor_version_st.h                             | 2 +-
 src/core/or/var_cell_st.h                                | 2 +-
 src/core/or/versions.c                                   | 2 +-
 src/core/or/versions.h                                   | 2 +-
 src/core/proto/proto_cell.c                              | 2 +-
 src/core/proto/proto_cell.h                              | 2 +-
 src/core/proto/proto_control0.c                          | 2 +-
 src/core/proto/proto_control0.h                          | 2 +-
 src/core/proto/proto_ext_or.c                            | 2 +-
 src/core/proto/proto_ext_or.h                            | 2 +-
 src/core/proto/proto_http.c                              | 2 +-
 src/core/proto/proto_http.h                              | 2 +-
 src/core/proto/proto_socks.c                             | 2 +-
 src/core/proto/proto_socks.h                             | 2 +-
 src/ext/ht.h                                             | 2 +-
 src/ext/trunnel/trunnel-impl.h                           | 2 +-
 src/ext/trunnel/trunnel.c                                | 2 +-
 src/ext/trunnel/trunnel.h                                | 2 +-
 src/feature/api/tor_api.c                                | 2 +-
 src/feature/api/tor_api.h                                | 2 +-
 src/feature/api/tor_api_internal.h                       | 2 +-
 src/feature/client/addressmap.c                          | 2 +-
 src/feature/client/addressmap.h                          | 2 +-
 src/feature/client/bridges.c                             | 2 +-
 src/feature/client/bridges.h                             | 2 +-
 src/feature/client/circpathbias.c                        | 2 +-
 src/feature/client/circpathbias.h                        | 2 +-
 src/feature/client/dnsserv.c                             | 2 +-
 src/feature/client/dnsserv.h                             | 2 +-
 src/feature/client/entrynodes.c                          | 2 +-
 src/feature/client/entrynodes.h                          | 2 +-
 src/feature/client/transports.c                          | 2 +-
 src/feature/client/transports.h                          | 2 +-
 src/feature/control/control.c                            | 2 +-
 src/feature/control/control.h                            | 2 +-
 src/feature/control/control_connection_st.h              | 2 +-
 src/feature/control/fmt_serverstatus.c                   | 2 +-
 src/feature/control/fmt_serverstatus.h                   | 2 +-
 src/feature/control/getinfo_geoip.h                      | 2 +-
 src/feature/dirauth/authmode.c                           | 2 +-
 src/feature/dirauth/authmode.h                           | 2 +-
 src/feature/dirauth/bwauth.c                             | 2 +-
 src/feature/dirauth/bwauth.h                             | 2 +-
 src/feature/dirauth/dircollate.c                         | 2 +-
 src/feature/dirauth/dircollate.h                         | 2 +-
 src/feature/dirauth/dirvote.c                            | 2 +-
 src/feature/dirauth/dirvote.h                            | 2 +-
 src/feature/dirauth/dsigs_parse.c                        | 2 +-
 src/feature/dirauth/dsigs_parse.h                        | 2 +-
 src/feature/dirauth/guardfraction.c                      | 2 +-
 src/feature/dirauth/guardfraction.h                      | 2 +-
 src/feature/dirauth/keypin.c                             | 2 +-
 src/feature/dirauth/keypin.h                             | 2 +-
 src/feature/dirauth/ns_detached_signatures_st.h          | 2 +-
 src/feature/dirauth/process_descs.c                      | 2 +-
 src/feature/dirauth/process_descs.h                      | 2 +-
 src/feature/dirauth/reachability.c                       | 2 +-
 src/feature/dirauth/reachability.h                       | 2 +-
 src/feature/dirauth/recommend_pkg.c                      | 2 +-
 src/feature/dirauth/recommend_pkg.h                      | 2 +-
 src/feature/dirauth/shared_random.c                      | 2 +-
 src/feature/dirauth/shared_random.h                      | 2 +-
 src/feature/dirauth/shared_random_state.c                | 2 +-
 src/feature/dirauth/shared_random_state.h                | 2 +-
 src/feature/dirauth/vote_microdesc_hash_st.h             | 2 +-
 src/feature/dirauth/voteflags.c                          | 2 +-
 src/feature/dirauth/voteflags.h                          | 2 +-
 src/feature/dircache/cached_dir_st.h                     | 2 +-
 src/feature/dircache/conscache.c                         | 2 +-
 src/feature/dircache/conscache.h                         | 2 +-
 src/feature/dircache/consdiffmgr.c                       | 2 +-
 src/feature/dircache/consdiffmgr.h                       | 2 +-
 src/feature/dircache/dircache.c                          | 2 +-
 src/feature/dircache/dircache.h                          | 2 +-
 src/feature/dircache/dirserv.c                           | 2 +-
 src/feature/dircache/dirserv.h                           | 2 +-
 src/feature/dirclient/dir_server_st.h                    | 2 +-
 src/feature/dirclient/dirclient.c                        | 2 +-
 src/feature/dirclient/dirclient.h                        | 2 +-
 src/feature/dirclient/dlstatus.c                         | 2 +-
 src/feature/dirclient/dlstatus.h                         | 2 +-
 src/feature/dirclient/download_status_st.h               | 2 +-
 src/feature/dircommon/consdiff.c                         | 2 +-
 src/feature/dircommon/consdiff.h                         | 2 +-
 src/feature/dircommon/dir_connection_st.h                | 2 +-
 src/feature/dircommon/directory.c                        | 2 +-
 src/feature/dircommon/directory.h                        | 2 +-
 src/feature/dircommon/fp_pair.c                          | 2 +-
 src/feature/dircommon/fp_pair.h                          | 2 +-
 src/feature/dircommon/vote_timing_st.h                   | 2 +-
 src/feature/dircommon/voting_schedule.c                  | 2 +-
 src/feature/dircommon/voting_schedule.h                  | 2 +-
 src/feature/dirparse/authcert_parse.c                    | 2 +-
 src/feature/dirparse/authcert_parse.h                    | 2 +-
 src/feature/dirparse/microdesc_parse.c                   | 2 +-
 src/feature/dirparse/microdesc_parse.h                   | 2 +-
 src/feature/dirparse/ns_parse.c                          | 2 +-
 src/feature/dirparse/ns_parse.h                          | 2 +-
 src/feature/dirparse/parsecommon.c                       | 2 +-
 src/feature/dirparse/parsecommon.h                       | 2 +-
 src/feature/dirparse/policy_parse.c                      | 2 +-
 src/feature/dirparse/policy_parse.h                      | 2 +-
 src/feature/dirparse/routerparse.c                       | 2 +-
 src/feature/dirparse/routerparse.h                       | 2 +-
 src/feature/dirparse/sigcommon.c                         | 2 +-
 src/feature/dirparse/sigcommon.h                         | 2 +-
 src/feature/dirparse/signing.c                           | 2 +-
 src/feature/dirparse/signing.h                           | 2 +-
 src/feature/dirparse/unparseable.c                       | 2 +-
 src/feature/dirparse/unparseable.h                       | 2 +-
 src/feature/hibernate/hibernate.c                        | 2 +-
 src/feature/hibernate/hibernate.h                        | 2 +-
 src/feature/hs/hs_cache.c                                | 2 +-
 src/feature/hs/hs_cache.h                                | 2 +-
 src/feature/hs/hs_cell.c                                 | 2 +-
 src/feature/hs/hs_cell.h                                 | 2 +-
 src/feature/hs/hs_circuit.c                              | 2 +-
 src/feature/hs/hs_circuit.h                              | 2 +-
 src/feature/hs/hs_circuitmap.c                           | 2 +-
 src/feature/hs/hs_circuitmap.h                           | 2 +-
 src/feature/hs/hs_client.c                               | 2 +-
 src/feature/hs/hs_client.h                               | 2 +-
 src/feature/hs/hs_common.c                               | 2 +-
 src/feature/hs/hs_common.h                               | 2 +-
 src/feature/hs/hs_config.c                               | 2 +-
 src/feature/hs/hs_config.h                               | 2 +-
 src/feature/hs/hs_control.c                              | 2 +-
 src/feature/hs/hs_control.h                              | 2 +-
 src/feature/hs/hs_descriptor.c                           | 2 +-
 src/feature/hs/hs_descriptor.h                           | 2 +-
 src/feature/hs/hs_ident.c                                | 2 +-
 src/feature/hs/hs_ident.h                                | 2 +-
 src/feature/hs/hs_intropoint.c                           | 2 +-
 src/feature/hs/hs_intropoint.h                           | 2 +-
 src/feature/hs/hs_service.c                              | 2 +-
 src/feature/hs/hs_service.h                              | 2 +-
 src/feature/hs/hs_stats.c                                | 2 +-
 src/feature/hs/hs_stats.h                                | 2 +-
 src/feature/hs/hsdir_index_st.h                          | 2 +-
 src/feature/hs_common/replaycache.c                      | 2 +-
 src/feature/hs_common/replaycache.h                      | 2 +-
 src/feature/hs_common/shared_random_client.c             | 2 +-
 src/feature/hs_common/shared_random_client.h             | 2 +-
 src/feature/keymgt/loadkey.c                             | 2 +-
 src/feature/keymgt/loadkey.h                             | 2 +-
 src/feature/nodelist/authcert.c                          | 2 +-
 src/feature/nodelist/authcert.h                          | 2 +-
 src/feature/nodelist/authority_cert_st.h                 | 2 +-
 src/feature/nodelist/desc_store_st.h                     | 2 +-
 src/feature/nodelist/describe.c                          | 2 +-
 src/feature/nodelist/describe.h                          | 2 +-
 src/feature/nodelist/dirlist.c                           | 2 +-
 src/feature/nodelist/dirlist.h                           | 2 +-
 src/feature/nodelist/document_signature_st.h             | 2 +-
 src/feature/nodelist/extrainfo_st.h                      | 2 +-
 src/feature/nodelist/fmt_routerstatus.c                  | 2 +-
 src/feature/nodelist/fmt_routerstatus.h                  | 2 +-
 src/feature/nodelist/microdesc.c                         | 2 +-
 src/feature/nodelist/microdesc.h                         | 2 +-
 src/feature/nodelist/microdesc_st.h                      | 2 +-
 src/feature/nodelist/networkstatus.c                     | 2 +-
 src/feature/nodelist/networkstatus.h                     | 2 +-
 src/feature/nodelist/networkstatus_sr_info_st.h          | 2 +-
 src/feature/nodelist/networkstatus_st.h                  | 2 +-
 src/feature/nodelist/networkstatus_voter_info_st.h       | 2 +-
 src/feature/nodelist/nickname.c                          | 2 +-
 src/feature/nodelist/nickname.h                          | 2 +-
 src/feature/nodelist/node_select.c                       | 2 +-
 src/feature/nodelist/node_select.h                       | 2 +-
 src/feature/nodelist/node_st.h                           | 2 +-
 src/feature/nodelist/nodelist.c                          | 2 +-
 src/feature/nodelist/nodelist.h                          | 2 +-
 src/feature/nodelist/routerinfo.c                        | 2 +-
 src/feature/nodelist/routerinfo.h                        | 2 +-
 src/feature/nodelist/routerinfo_st.h                     | 2 +-
 src/feature/nodelist/routerlist.c                        | 2 +-
 src/feature/nodelist/routerlist.h                        | 2 +-
 src/feature/nodelist/routerlist_st.h                     | 2 +-
 src/feature/nodelist/routerset.c                         | 2 +-
 src/feature/nodelist/routerset.h                         | 2 +-
 src/feature/nodelist/routerstatus_st.h                   | 2 +-
 src/feature/nodelist/signed_descriptor_st.h              | 2 +-
 src/feature/nodelist/torcert.c                           | 2 +-
 src/feature/nodelist/torcert.h                           | 2 +-
 src/feature/nodelist/vote_routerstatus_st.h              | 2 +-
 src/feature/relay/dns.c                                  | 2 +-
 src/feature/relay/dns.h                                  | 2 +-
 src/feature/relay/dns_structs.h                          | 2 +-
 src/feature/relay/ext_orport.c                           | 2 +-
 src/feature/relay/ext_orport.h                           | 2 +-
 src/feature/relay/onion_queue.c                          | 2 +-
 src/feature/relay/onion_queue.h                          | 2 +-
 src/feature/relay/router.c                               | 2 +-
 src/feature/relay/router.h                               | 2 +-
 src/feature/relay/routerkeys.c                           | 2 +-
 src/feature/relay/routerkeys.h                           | 2 +-
 src/feature/relay/routermode.c                           | 2 +-
 src/feature/relay/routermode.h                           | 2 +-
 src/feature/relay/selftest.c                             | 2 +-
 src/feature/relay/selftest.h                             | 2 +-
 src/feature/rend/rend_authorized_client_st.h             | 2 +-
 src/feature/rend/rend_encoded_v2_service_descriptor_st.h | 2 +-
 src/feature/rend/rend_intro_point_st.h                   | 2 +-
 src/feature/rend/rend_service_descriptor_st.h            | 2 +-
 src/feature/rend/rendcache.c                             | 2 +-
 src/feature/rend/rendcache.h                             | 2 +-
 src/feature/rend/rendclient.c                            | 2 +-
 src/feature/rend/rendclient.h                            | 2 +-
 src/feature/rend/rendcommon.c                            | 2 +-
 src/feature/rend/rendcommon.h                            | 2 +-
 src/feature/rend/rendmid.c                               | 2 +-
 src/feature/rend/rendmid.h                               | 2 +-
 src/feature/rend/rendparse.c                             | 2 +-
 src/feature/rend/rendparse.h                             | 2 +-
 src/feature/rend/rendservice.c                           | 2 +-
 src/feature/rend/rendservice.h                           | 2 +-
 src/feature/stats/geoip_stats.c                          | 2 +-
 src/feature/stats/geoip_stats.h                          | 2 +-
 src/feature/stats/predict_ports.c                        | 2 +-
 src/feature/stats/predict_ports.h                        | 2 +-
 src/feature/stats/rephist.c                              | 2 +-
 src/feature/stats/rephist.h                              | 2 +-
 src/lib/arch/bytes.h                                     | 2 +-
 src/lib/cc/compat_compiler.h                             | 2 +-
 src/lib/cc/torint.h                                      | 2 +-
 src/lib/compress/compress.c                              | 2 +-
 src/lib/compress/compress.h                              | 2 +-
 src/lib/compress/compress_buf.c                          | 2 +-
 src/lib/compress/compress_lzma.c                         | 2 +-
 src/lib/compress/compress_lzma.h                         | 2 +-
 src/lib/compress/compress_none.c                         | 2 +-
 src/lib/compress/compress_none.h                         | 2 +-
 src/lib/compress/compress_zlib.c                         | 2 +-
 src/lib/compress/compress_zlib.h                         | 2 +-
 src/lib/compress/compress_zstd.c                         | 2 +-
 src/lib/compress/compress_zstd.h                         | 2 +-
 src/lib/container/bitarray.h                             | 2 +-
 src/lib/container/bloomfilt.c                            | 2 +-
 src/lib/container/bloomfilt.h                            | 2 +-
 src/lib/container/buffers.c                              | 2 +-
 src/lib/container/buffers.h                              | 2 +-
 src/lib/container/handles.h                              | 2 +-
 src/lib/container/map.c                                  | 2 +-
 src/lib/container/map.h                                  | 2 +-
 src/lib/container/order.c                                | 2 +-
 src/lib/container/order.h                                | 2 +-
 src/lib/container/smartlist.c                            | 2 +-
 src/lib/container/smartlist.h                            | 2 +-
 src/lib/crypt_ops/aes.h                                  | 2 +-
 src/lib/crypt_ops/aes_nss.c                              | 2 +-
 src/lib/crypt_ops/aes_openssl.c                          | 2 +-
 src/lib/crypt_ops/compat_openssl.h                       | 2 +-
 src/lib/crypt_ops/crypto_cipher.c                        | 2 +-
 src/lib/crypt_ops/crypto_cipher.h                        | 2 +-
 src/lib/crypt_ops/crypto_curve25519.c                    | 2 +-
 src/lib/crypt_ops/crypto_curve25519.h                    | 2 +-
 src/lib/crypt_ops/crypto_dh.c                            | 2 +-
 src/lib/crypt_ops/crypto_dh.h                            | 2 +-
 src/lib/crypt_ops/crypto_dh_nss.c                        | 2 +-
 src/lib/crypt_ops/crypto_dh_openssl.c                    | 2 +-
 src/lib/crypt_ops/crypto_digest.c                        | 2 +-
 src/lib/crypt_ops/crypto_digest.h                        | 2 +-
 src/lib/crypt_ops/crypto_ed25519.c                       | 2 +-
 src/lib/crypt_ops/crypto_ed25519.h                       | 2 +-
 src/lib/crypt_ops/crypto_format.c                        | 2 +-
 src/lib/crypt_ops/crypto_format.h                        | 2 +-
 src/lib/crypt_ops/crypto_hkdf.c                          | 2 +-
 src/lib/crypt_ops/crypto_hkdf.h                          | 2 +-
 src/lib/crypt_ops/crypto_init.c                          | 2 +-
 src/lib/crypt_ops/crypto_init.h                          | 2 +-
 src/lib/crypt_ops/crypto_nss_mgt.c                       | 2 +-
 src/lib/crypt_ops/crypto_nss_mgt.h                       | 2 +-
 src/lib/crypt_ops/crypto_ope.c                           | 2 +-
 src/lib/crypt_ops/crypto_ope.h                           | 2 +-
 src/lib/crypt_ops/crypto_openssl_mgt.c                   | 2 +-
 src/lib/crypt_ops/crypto_openssl_mgt.h                   | 2 +-
 src/lib/crypt_ops/crypto_pwbox.c                         | 2 +-
 src/lib/crypt_ops/crypto_pwbox.h                         | 2 +-
 src/lib/crypt_ops/crypto_rand.c                          | 2 +-
 src/lib/crypt_ops/crypto_rand.h                          | 2 +-
 src/lib/crypt_ops/crypto_rsa.c                           | 2 +-
 src/lib/crypt_ops/crypto_rsa.h                           | 2 +-
 src/lib/crypt_ops/crypto_rsa_nss.c                       | 2 +-
 src/lib/crypt_ops/crypto_rsa_openssl.c                   | 2 +-
 src/lib/crypt_ops/crypto_s2k.c                           | 2 +-
 src/lib/crypt_ops/crypto_s2k.h                           | 2 +-
 src/lib/crypt_ops/crypto_util.c                          | 2 +-
 src/lib/crypt_ops/crypto_util.h                          | 2 +-
 src/lib/crypt_ops/digestset.c                            | 2 +-
 src/lib/crypt_ops/digestset.h                            | 2 +-
 src/lib/ctime/di_ops.c                                   | 2 +-
 src/lib/ctime/di_ops.h                                   | 2 +-
 src/lib/defs/dh_sizes.h                                  | 2 +-
 src/lib/defs/digest_sizes.h                              | 2 +-
 src/lib/defs/x25519_sizes.h                              | 2 +-
 src/lib/encoding/binascii.c                              | 2 +-
 src/lib/encoding/binascii.h                              | 2 +-
 src/lib/encoding/confline.c                              | 2 +-
 src/lib/encoding/confline.h                              | 2 +-
 src/lib/encoding/cstring.c                               | 2 +-
 src/lib/encoding/cstring.h                               | 2 +-
 src/lib/encoding/keyval.c                                | 2 +-
 src/lib/encoding/keyval.h                                | 2 +-
 src/lib/encoding/pem.c                                   | 2 +-
 src/lib/encoding/pem.h                                   | 2 +-
 src/lib/encoding/time_fmt.c                              | 2 +-
 src/lib/encoding/time_fmt.h                              | 2 +-
 src/lib/err/backtrace.c                                  | 2 +-
 src/lib/err/backtrace.h                                  | 2 +-
 src/lib/err/torerr.c                                     | 2 +-
 src/lib/err/torerr.h                                     | 2 +-
 src/lib/evloop/compat_libevent.c                         | 2 +-
 src/lib/evloop/compat_libevent.h                         | 2 +-
 src/lib/evloop/procmon.c                                 | 2 +-
 src/lib/evloop/procmon.h                                 | 2 +-
 src/lib/evloop/timers.c                                  | 2 +-
 src/lib/evloop/timers.h                                  | 2 +-
 src/lib/evloop/token_bucket.c                            | 2 +-
 src/lib/evloop/token_bucket.h                            | 2 +-
 src/lib/evloop/workqueue.h                               | 2 +-
 src/lib/fdio/fdio.c                                      | 2 +-
 src/lib/fdio/fdio.h                                      | 2 +-
 src/lib/fs/conffile.c                                    | 2 +-
 src/lib/fs/conffile.h                                    | 2 +-
 src/lib/fs/dir.c                                         | 2 +-
 src/lib/fs/dir.h                                         | 2 +-
 src/lib/fs/files.c                                       | 2 +-
 src/lib/fs/files.h                                       | 2 +-
 src/lib/fs/freespace.c                                   | 2 +-
 src/lib/fs/lockfile.c                                    | 2 +-
 src/lib/fs/lockfile.h                                    | 2 +-
 src/lib/fs/mmap.c                                        | 2 +-
 src/lib/fs/mmap.h                                        | 2 +-
 src/lib/fs/path.c                                        | 2 +-
 src/lib/fs/path.h                                        | 2 +-
 src/lib/fs/storagedir.c                                  | 2 +-
 src/lib/fs/storagedir.h                                  | 2 +-
 src/lib/fs/userdb.c                                      | 2 +-
 src/lib/fs/userdb.h                                      | 2 +-
 src/lib/fs/winlib.c                                      | 2 +-
 src/lib/fs/winlib.h                                      | 2 +-
 src/lib/geoip/country.h                                  | 2 +-
 src/lib/geoip/geoip.c                                    | 2 +-
 src/lib/geoip/geoip.h                                    | 2 +-
 src/lib/intmath/addsub.c                                 | 2 +-
 src/lib/intmath/addsub.h                                 | 2 +-
 src/lib/intmath/bits.c                                   | 2 +-
 src/lib/intmath/bits.h                                   | 2 +-
 src/lib/intmath/cmp.h                                    | 2 +-
 src/lib/intmath/logic.h                                  | 2 +-
 src/lib/intmath/muldiv.c                                 | 2 +-
 src/lib/intmath/muldiv.h                                 | 2 +-
 src/lib/intmath/weakrng.c                                | 2 +-
 src/lib/intmath/weakrng.h                                | 2 +-
 src/lib/lock/compat_mutex.c                              | 2 +-
 src/lib/lock/compat_mutex.h                              | 2 +-
 src/lib/lock/compat_mutex_pthreads.c                     | 2 +-
 src/lib/lock/compat_mutex_winthreads.c                   | 2 +-
 src/lib/log/escape.c                                     | 2 +-
 src/lib/log/escape.h                                     | 2 +-
 src/lib/log/git_revision.c                               | 2 +-
 src/lib/log/git_revision.h                               | 2 +-
 src/lib/log/log.c                                        | 2 +-
 src/lib/log/log.h                                        | 2 +-
 src/lib/log/ratelim.c                                    | 2 +-
 src/lib/log/ratelim.h                                    | 2 +-
 src/lib/log/util_bug.c                                   | 2 +-
 src/lib/log/util_bug.h                                   | 2 +-
 src/lib/log/win32err.c                                   | 2 +-
 src/lib/log/win32err.h                                   | 2 +-
 src/lib/malloc/malloc.c                                  | 2 +-
 src/lib/malloc/malloc.h                                  | 2 +-
 src/lib/math/fp.c                                        | 2 +-
 src/lib/math/fp.h                                        | 2 +-
 src/lib/math/laplace.c                                   | 2 +-
 src/lib/math/laplace.h                                   | 2 +-
 src/lib/memarea/memarea.c                                | 2 +-
 src/lib/memarea/memarea.h                                | 2 +-
 src/lib/meminfo/meminfo.c                                | 2 +-
 src/lib/meminfo/meminfo.h                                | 2 +-
 src/lib/net/address.c                                    | 2 +-
 src/lib/net/address.h                                    | 2 +-
 src/lib/net/alertsock.c                                  | 2 +-
 src/lib/net/alertsock.h                                  | 2 +-
 src/lib/net/buffers_net.c                                | 2 +-
 src/lib/net/buffers_net.h                                | 2 +-
 src/lib/net/gethostname.c                                | 2 +-
 src/lib/net/gethostname.h                                | 2 +-
 src/lib/net/inaddr.c                                     | 2 +-
 src/lib/net/inaddr.h                                     | 2 +-
 src/lib/net/inaddr_st.h                                  | 2 +-
 src/lib/net/nettypes.h                                   | 2 +-
 src/lib/net/resolve.c                                    | 2 +-
 src/lib/net/resolve.h                                    | 2 +-
 src/lib/net/socket.c                                     | 2 +-
 src/lib/net/socket.h                                     | 2 +-
 src/lib/net/socketpair.c                                 | 2 +-
 src/lib/net/socketpair.h                                 | 2 +-
 src/lib/net/socks5_status.h                              | 2 +-
 src/lib/osinfo/uname.c                                   | 2 +-
 src/lib/osinfo/uname.h                                   | 2 +-
 src/lib/process/daemon.c                                 | 2 +-
 src/lib/process/daemon.h                                 | 2 +-
 src/lib/process/env.c                                    | 2 +-
 src/lib/process/env.h                                    | 2 +-
 src/lib/process/pidfile.c                                | 2 +-
 src/lib/process/pidfile.h                                | 2 +-
 src/lib/process/restrict.c                               | 2 +-
 src/lib/process/restrict.h                               | 2 +-
 src/lib/process/setuid.c                                 | 2 +-
 src/lib/process/setuid.h                                 | 2 +-
 src/lib/process/subprocess.c                             | 2 +-
 src/lib/process/subprocess.h                             | 2 +-
 src/lib/process/waitpid.c                                | 2 +-
 src/lib/process/waitpid.h                                | 2 +-
 src/lib/sandbox/sandbox.c                                | 2 +-
 src/lib/sandbox/sandbox.h                                | 2 +-
 src/lib/smartlist_core/smartlist_core.c                  | 2 +-
 src/lib/smartlist_core/smartlist_core.h                  | 2 +-
 src/lib/smartlist_core/smartlist_foreach.h               | 2 +-
 src/lib/smartlist_core/smartlist_split.c                 | 2 +-
 src/lib/smartlist_core/smartlist_split.h                 | 2 +-
 src/lib/string/compat_ctype.c                            | 2 +-
 src/lib/string/compat_ctype.h                            | 2 +-
 src/lib/string/compat_string.c                           | 2 +-
 src/lib/string/compat_string.h                           | 2 +-
 src/lib/string/parse_int.c                               | 2 +-
 src/lib/string/parse_int.h                               | 2 +-
 src/lib/string/printf.c                                  | 2 +-
 src/lib/string/printf.h                                  | 2 +-
 src/lib/string/scanf.c                                   | 2 +-
 src/lib/string/scanf.h                                   | 2 +-
 src/lib/string/util_string.c                             | 2 +-
 src/lib/string/util_string.h                             | 2 +-
 src/lib/term/getpass.c                                   | 2 +-
 src/lib/term/getpass.h                                   | 2 +-
 src/lib/testsupport/testsupport.h                        | 2 +-
 src/lib/thread/compat_pthreads.c                         | 2 +-
 src/lib/thread/compat_threads.c                          | 2 +-
 src/lib/thread/compat_winthreads.c                       | 2 +-
 src/lib/thread/numcpus.c                                 | 2 +-
 src/lib/thread/numcpus.h                                 | 2 +-
 src/lib/thread/threads.h                                 | 2 +-
 src/lib/time/compat_time.c                               | 2 +-
 src/lib/time/compat_time.h                               | 2 +-
 src/lib/time/tvdiff.c                                    | 2 +-
 src/lib/time/tvdiff.h                                    | 2 +-
 src/lib/tls/buffers_tls.c                                | 2 +-
 src/lib/tls/buffers_tls.h                                | 2 +-
 src/lib/tls/nss_countbytes.c                             | 2 +-
 src/lib/tls/nss_countbytes.h                             | 2 +-
 src/lib/tls/tortls.c                                     | 2 +-
 src/lib/tls/tortls.h                                     | 2 +-
 src/lib/tls/tortls_internal.h                            | 2 +-
 src/lib/tls/tortls_nss.c                                 | 2 +-
 src/lib/tls/tortls_openssl.c                             | 2 +-
 src/lib/tls/tortls_st.h                                  | 2 +-
 src/lib/tls/x509.c                                       | 2 +-
 src/lib/tls/x509.h                                       | 2 +-
 src/lib/tls/x509_internal.h                              | 2 +-
 src/lib/tls/x509_nss.c                                   | 2 +-
 src/lib/tls/x509_openssl.c                               | 2 +-
 src/lib/trace/debug.h                                    | 2 +-
 src/lib/trace/events.h                                   | 2 +-
 src/lib/trace/trace.c                                    | 2 +-
 src/lib/trace/trace.h                                    | 2 +-
 src/lib/wallclock/approx_time.c                          | 2 +-
 src/lib/wallclock/approx_time.h                          | 2 +-
 src/lib/wallclock/time_to_tm.c                           | 2 +-
 src/lib/wallclock/time_to_tm.h                           | 2 +-
 src/lib/wallclock/timeval.h                              | 2 +-
 src/lib/wallclock/tor_gettimeofday.c                     | 2 +-
 src/lib/wallclock/tor_gettimeofday.h                     | 2 +-
 src/rust/crypto/digests/mod.rs                           | 2 +-
 src/rust/crypto/digests/sha2.rs                          | 2 +-
 src/rust/crypto/lib.rs                                   | 2 +-
 src/rust/crypto/rand/mod.rs                              | 2 +-
 src/rust/crypto/rand/rng.rs                              | 2 +-
 src/rust/external/crypto_digest.rs                       | 2 +-
 src/rust/external/crypto_rand.rs                         | 2 +-
 src/rust/external/external.rs                            | 2 +-
 src/rust/external/lib.rs                                 | 2 +-
 src/rust/protover/errors.rs                              | 2 +-
 src/rust/protover/ffi.rs                                 | 2 +-
 src/rust/protover/lib.rs                                 | 2 +-
 src/rust/protover/protoset.rs                            | 2 +-
 src/rust/protover/protover.rs                            | 2 +-
 src/rust/protover/tests/protover.rs                      | 2 +-
 src/rust/smartlist/lib.rs                                | 2 +-
 src/rust/smartlist/smartlist.rs                          | 2 +-
 src/rust/tor_allocate/lib.rs                             | 2 +-
 src/rust/tor_allocate/tor_allocate.rs                    | 2 +-
 src/rust/tor_log/lib.rs                                  | 2 +-
 src/rust/tor_log/tor_log.rs                              | 2 +-
 src/rust/tor_util/ffi.rs                                 | 2 +-
 src/rust/tor_util/lib.rs                                 | 2 +-
 src/rust/tor_util/strings.rs                             | 2 +-
 src/test/bench.c                                         | 2 +-
 src/test/bt_test.py                                      | 2 +-
 src/test/ed25519_exts_ref.py                             | 2 +-
 src/test/fakechans.h                                     | 2 +-
 src/test/fuzz/dict/http                                  | 2 +-
 src/test/fuzz/fuzz_consensus.c                           | 2 +-
 src/test/fuzz/fuzz_descriptor.c                          | 2 +-
 src/test/fuzz/fuzz_diff.c                                | 2 +-
 src/test/fuzz/fuzz_diff_apply.c                          | 2 +-
 src/test/fuzz/fuzz_extrainfo.c                           | 2 +-
 src/test/fuzz/fuzz_hsdescv2.c                            | 2 +-
 src/test/fuzz/fuzz_hsdescv3.c                            | 2 +-
 src/test/fuzz/fuzz_http.c                                | 2 +-
 src/test/fuzz/fuzz_http_connect.c                        | 2 +-
 src/test/fuzz/fuzz_iptsv2.c                              | 2 +-
 src/test/fuzz/fuzz_microdesc.c                           | 2 +-
 src/test/fuzz/fuzz_socks.c                               | 2 +-
 src/test/fuzz/fuzz_vrs.c                                 | 2 +-
 src/test/fuzz/fuzzing.h                                  | 2 +-
 src/test/fuzz/fuzzing_common.c                           | 2 +-
 src/test/fuzz_static_testcases.sh                        | 2 +-
 src/test/hs_ntor_ref.py                                  | 2 +-
 src/test/hs_test_helpers.c                               | 2 +-
 src/test/hs_test_helpers.h                               | 2 +-
 src/test/log_test_helpers.c                              | 2 +-
 src/test/log_test_helpers.h                              | 2 +-
 src/test/ntor_ref.py                                     | 2 +-
 src/test/ope_ref.py                                      | 2 +-
 src/test/rend_test_helpers.c                             | 2 +-
 src/test/rend_test_helpers.h                             | 2 +-
 src/test/test-child.c                                    | 2 +-
 src/test/test-memwipe.c                                  | 2 +-
 src/test/test-timers.c                                   | 2 +-
 src/test/test.c                                          | 2 +-
 src/test/test.h                                          | 2 +-
 src/test/test_accounting.c                               | 2 +-
 src/test/test_addr.c                                     | 2 +-
 src/test/test_address.c                                  | 2 +-
 src/test/test_address_set.c                              | 2 +-
 src/test/test_bridges.c                                  | 2 +-
 src/test/test_bt_cl.c                                    | 2 +-
 src/test/test_buffers.c                                  | 2 +-
 src/test/test_bwmgt.c                                    | 2 +-
 src/test/test_cell_formats.c                             | 2 +-
 src/test/test_cell_queue.c                               | 2 +-
 src/test/test_channel.c                                  | 2 +-
 src/test/test_channelpadding.c                           | 2 +-
 src/test/test_channeltls.c                               | 2 +-
 src/test/test_checkdir.c                                 | 2 +-
 src/test/test_circuitbuild.c                             | 2 +-
 src/test/test_circuitlist.c                              | 2 +-
 src/test/test_circuitmux.c                               | 2 +-
 src/test/test_circuitstats.c                             | 2 +-
 src/test/test_circuituse.c                               | 2 +-
 src/test/test_compat_libevent.c                          | 2 +-
 src/test/test_config.c                                   | 2 +-
 src/test/test_connection.c                               | 2 +-
 src/test/test_connection.h                               | 2 +-
 src/test/test_conscache.c                                | 2 +-
 src/test/test_consdiff.c                                 | 2 +-
 src/test/test_consdiffmgr.c                              | 2 +-
 src/test/test_containers.c                               | 2 +-
 src/test/test_controller.c                               | 2 +-
 src/test/test_controller_events.c                        | 2 +-
 src/test/test_crypto.c                                   | 2 +-
 src/test/test_crypto_ope.c                               | 2 +-
 src/test/test_crypto_openssl.c                           | 2 +-
 src/test/test_crypto_slow.c                              | 2 +-
 src/test/test_data.c                                     | 2 +-
 src/test/test_dir.c                                      | 2 +-
 src/test/test_dir_common.c                               | 2 +-
 src/test/test_dir_common.h                               | 2 +-
 src/test/test_dir_handle_get.c                           | 2 +-
 src/test/test_dns.c                                      | 2 +-
 src/test/test_dos.c                                      | 2 +-
 src/test/test_entryconn.c                                | 2 +-
 src/test/test_entrynodes.c                               | 2 +-
 src/test/test_extorport.c                                | 2 +-
 src/test/test_geoip.c                                    | 2 +-
 src/test/test_guardfraction.c                            | 2 +-
 src/test/test_handles.c                                  | 2 +-
 src/test/test_helpers.c                                  | 2 +-
 src/test/test_helpers.h                                  | 2 +-
 src/test/test_hs.c                                       | 2 +-
 src/test/test_hs_cache.c                                 | 2 +-
 src/test/test_hs_cell.c                                  | 2 +-
 src/test/test_hs_client.c                                | 2 +-
 src/test/test_hs_common.c                                | 2 +-
 src/test/test_hs_config.c                                | 2 +-
 src/test/test_hs_control.c                               | 2 +-
 src/test/test_hs_descriptor.c                            | 2 +-
 src/test/test_hs_intropoint.c                            | 2 +-
 src/test/test_hs_ntor.c                                  | 2 +-
 src/test/test_hs_ntor_cl.c                               | 2 +-
 src/test/test_hs_service.c                               | 2 +-
 src/test/test_introduce.c                                | 2 +-
 src/test/test_keypin.c                                   | 2 +-
 src/test/test_link_handshake.c                           | 2 +-
 src/test/test_logging.c                                  | 2 +-
 src/test/test_mainloop.c                                 | 2 +-
 src/test/test_microdesc.c                                | 2 +-
 src/test/test_nodelist.c                                 | 2 +-
 src/test/test_ntor_cl.c                                  | 2 +-
 src/test/test_oom.c                                      | 2 +-
 src/test/test_oos.c                                      | 2 +-
 src/test/test_options.c                                  | 2 +-
 src/test/test_pem.c                                      | 2 +-
 src/test/test_periodic_event.c                           | 2 +-
 src/test/test_policy.c                                   | 2 +-
 src/test/test_procmon.c                                  | 2 +-
 src/test/test_proto_http.c                               | 2 +-
 src/test/test_proto_misc.c                               | 2 +-
 src/test/test_protover.c                                 | 2 +-
 src/test/test_pt.c                                       | 2 +-
 src/test/test_relay.c                                    | 2 +-
 src/test/test_relaycell.c                                | 2 +-
 src/test/test_relaycrypt.c                               | 2 +-
 src/test/test_rendcache.c                                | 2 +-
 src/test/test_replay.c                                   | 2 +-
 src/test/test_router.c                                   | 2 +-
 src/test/test_routerkeys.c                               | 2 +-
 src/test/test_routerlist.c                               | 2 +-
 src/test/test_routerset.c                                | 2 +-
 src/test/test_scheduler.c                                | 2 +-
 src/test/test_shared_random.c                            | 2 +-
 src/test/test_slow.c                                     | 2 +-
 src/test/test_socks.c                                    | 2 +-
 src/test/test_status.c                                   | 2 +-
 src/test/test_storagedir.c                               | 2 +-
 src/test/test_switch_id.c                                | 2 +-
 src/test/test_threads.c                                  | 2 +-
 src/test/test_tortls.c                                   | 2 +-
 src/test/test_tortls.h                                   | 2 +-
 src/test/test_tortls_openssl.c                           | 2 +-
 src/test/test_util.c                                     | 2 +-
 src/test/test_util_format.c                              | 2 +-
 src/test/test_util_process.c                             | 2 +-
 src/test/test_util_slow.c                                | 2 +-
 src/test/test_voting_schedule.c                          | 2 +-
 src/test/test_workqueue.c                                | 2 +-
 src/test/test_x509.c                                     | 2 +-
 src/test/testing_common.c                                | 2 +-
 src/test/testing_rsakeys.c                               | 2 +-
 src/tools/tor-gencert.c                                  | 2 +-
 src/tools/tor-print-ed-signing-cert.c                    | 2 +-
 src/tools/tor-resolve.c                                  | 2 +-
 src/tools/tor_runner.c                                   | 2 +-
 760 files changed, 761 insertions(+), 761 deletions(-)



More information about the tor-commits mailing list