[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'destroy_common'
commit 02ba0a2dbbe1032b56d0ba17468f2ee0d95e4f1b
Merge: 3d610363e f7eff3008
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Thu Jul 5 15:42:55 2018 -0400
Merge branch 'destroy_common'
.gitignore | 15 +------
Makefile.am | 6 +--
scripts/codegen/fuzzing_include_am.py | 23 ++---------
src/common/Makefile.nmake | 28 -------------
src/common/include.am | 62 ----------------------------
src/common/util.h | 52 -----------------------
src/include.am | 2 +-
src/{common => lib/container}/handles.h | 0
src/lib/container/include.am | 1 +
src/lib/evloop/.may_include | 15 +++++++
src/{common => lib/evloop}/compat_libevent.c | 2 +-
src/{common => lib/evloop}/compat_libevent.h | 0
src/lib/evloop/include.am | 26 ++++++++++++
src/{common => lib/evloop}/procmon.c | 2 +-
src/{common => lib/evloop}/procmon.h | 2 +-
src/{common => lib/evloop}/timers.c | 4 +-
src/{common => lib/evloop}/timers.h | 0
src/{common => lib/evloop}/token_bucket.c | 2 +-
src/{common => lib/evloop}/token_bucket.h | 0
src/{common => lib/evloop}/workqueue.c | 4 +-
src/{common => lib/evloop}/workqueue.h | 0
src/lib/malloc/include.am | 4 ++
src/lib/net/include.am | 3 +-
src/{common => lib/net}/socks5_status.h | 0
src/{common => or}/address_set.c | 2 +-
src/{common => or}/address_set.h | 0
src/or/channel.c | 2 +-
src/or/channel.h | 2 +-
src/or/channelpadding.c | 2 +-
src/or/config.c | 3 +-
src/or/connection.c | 2 +-
src/or/connection_edge.c | 2 +-
src/or/conscache.h | 2 +-
src/or/consdiffmgr.c | 4 +-
src/or/control.c | 6 +--
src/or/cpuworker.c | 2 +-
src/or/dirauth/shared_random.c | 1 -
src/or/dns.c | 2 +-
src/or/dnsserv.c | 2 +-
src/or/entrynodes.h | 2 +-
src/or/ext_orport.c | 1 -
src/or/hibernate.c | 2 +-
src/or/hs_cell.c | 1 -
src/or/include.am | 2 +
src/or/keypin.c | 25 ++++++++---
src/or/main.c | 4 +-
src/or/nodelist.c | 2 +-
src/or/ntmain.c | 2 +-
src/or/onion_ntor.c | 11 +++--
src/or/or.h | 38 ++++++++++++++++-
src/or/or_connection_st.h | 2 +-
src/or/periodic.c | 4 +-
src/or/reasons.h | 2 +-
src/or/scheduler.c | 4 +-
src/or/shared_random_client.c | 1 -
src/or/torcert.c | 1 -
src/or/transports.c | 1 -
src/test/fuzz/fuzz_hsdescv3.c | 1 -
src/test/include.am | 2 +-
src/test/test-memwipe.c | 9 ++--
src/test/test-timers.c | 9 ++--
src/test/test_address_set.c | 2 +-
src/test/test_bridges.c | 1 -
src/test/test_bt_cl.c | 1 -
src/test/test_bwmgt.c | 2 +-
src/test/test_channelpadding.c | 4 +-
src/test/test_checkdir.c | 1 -
src/test/test_compat_libevent.c | 2 +-
src/test/test_config.c | 1 -
src/test/test_consdiffmgr.c | 2 +-
src/test/test_crypto.c | 1 -
src/test/test_crypto_openssl.c | 5 +--
src/test/test_entrynodes.c | 1 -
src/test/test_guardfraction.c | 1 -
src/test/test_handles.c | 7 ++--
src/test/test_hs_common.c | 1 -
src/test/test_hs_ntor_cl.c | 1 -
src/test/test_keypin.c | 1 -
src/test/test_ntor_cl.c | 1 -
src/test/test_oom.c | 2 +-
src/test/test_procmon.c | 2 +-
src/test/test_pt.c | 1 -
src/test/test_routerkeys.c | 1 -
src/test/test_scheduler.c | 2 +-
src/test/test_socks.c | 2 +-
src/test/test_util_slow.c | 8 +++-
src/test/test_workqueue.c | 4 +-
src/test/testing_common.c | 2 +-
src/tools/tor-resolve.c | 2 +-
89 files changed, 195 insertions(+), 279 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits