[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'post-refactor-renaming'
commit c08b7b10c520db08e20e6ac5630f0a668d5ecf3a
Merge: 9ec80909e b6d0e7caa
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Tue Jul 10 15:35:49 2018 -0400
Merge branch 'post-refactor-renaming'
src/core/crypto/onion_ntor.c | 2 +-
src/core/or/or.h | 2 +-
src/feature/dirauth/keypin.c | 2 +-
src/feature/nodelist/parsecommon.c | 2 +-
src/feature/nodelist/torcert.c | 2 +-
src/lib/compress/compress.c | 4 ++--
src/lib/compress/compress_lzma.c | 4 ++--
src/lib/compress/compress_none.c | 2 +-
src/lib/compress/compress_zlib.c | 2 +-
src/lib/compress/compress_zstd.c | 2 +-
src/lib/container/bitarray.h | 2 +-
src/lib/container/bloomfilt.c | 2 +-
src/lib/container/buffers.c | 4 ++--
src/lib/container/handles.h | 2 +-
src/lib/container/map.c | 2 +-
src/lib/container/smartlist.c | 2 +-
src/lib/crypt_ops/aes.c | 2 +-
src/lib/crypt_ops/aes.h | 2 +-
src/lib/crypt_ops/crypto.c | 2 +-
src/lib/crypt_ops/crypto_curve25519.c | 2 +-
src/lib/crypt_ops/crypto_dh.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_format.c | 2 +-
src/lib/crypt_ops/crypto_rand.c | 4 ++--
src/lib/crypt_ops/crypto_rsa.c | 2 +-
src/lib/crypt_ops/crypto_rsa.h | 2 +-
src/lib/crypt_ops/crypto_util.c | 2 +-
src/lib/ctime/di_ops.c | 2 +-
src/lib/encoding/binascii.c | 4 ++--
src/lib/encoding/confline.c | 4 ++--
src/lib/encoding/cstring.c | 4 ++--
src/lib/encoding/keyval.c | 2 +-
src/lib/encoding/time_fmt.c | 6 +++---
src/lib/evloop/compat_libevent.c | 2 +-
src/lib/evloop/compat_libevent.h | 2 +-
src/lib/evloop/procmon.c | 4 ++--
src/lib/evloop/procmon.h | 2 +-
src/lib/evloop/timers.c | 4 ++--
src/lib/evloop/workqueue.c | 2 +-
src/lib/fs/conffile.c | 4 ++--
src/lib/fs/dir.c | 4 ++--
src/lib/fs/files.c | 4 ++--
src/lib/fs/lockfile.c | 4 ++--
src/lib/fs/mmap.c | 4 ++--
src/lib/fs/path.c | 4 ++--
src/lib/fs/storagedir.c | 4 ++--
src/lib/fs/userdb.c | 4 ++--
src/lib/lock/compat_mutex.c | 2 +-
src/lib/lock/compat_mutex.h | 2 +-
src/lib/log/escape.c | 2 +-
src/lib/log/include.am | 4 ++--
src/lib/log/{torlog.c => log.c} | 8 ++++----
src/lib/log/{torlog.h => log.h} | 2 +-
src/lib/log/ratelim.c | 2 +-
src/lib/log/util_bug.c | 4 ++--
src/lib/log/util_bug.h | 2 +-
src/lib/log/win32err.c | 2 +-
src/lib/malloc/include.am | 4 ++--
src/lib/malloc/{util_malloc.c => malloc.c} | 4 ++--
src/lib/malloc/{util_malloc.h => malloc.h} | 2 +-
src/lib/memarea/memarea.c | 4 ++--
src/lib/meminfo/meminfo.c | 4 ++--
src/lib/net/address.c | 4 ++--
src/lib/net/buffers_net.c | 2 +-
src/lib/net/resolve.c | 2 +-
src/lib/net/socket.c | 2 +-
src/lib/process/daemon.c | 2 +-
src/lib/process/env.c | 6 +++---
src/lib/process/pidfile.c | 2 +-
src/lib/process/restrict.c | 2 +-
src/lib/process/setuid.c | 4 ++--
src/lib/process/subprocess.c | 4 ++--
src/lib/process/waitpid.c | 4 ++--
src/lib/sandbox/sandbox.c | 4 ++--
src/lib/smartlist_core/smartlist_core.c | 2 +-
src/lib/smartlist_core/smartlist_split.c | 2 +-
src/lib/string/printf.c | 2 +-
src/lib/term/getpass.c | 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/time/compat_time.c | 2 +-
src/lib/time/tvdiff.c | 2 +-
src/lib/tls/buffers_tls.c | 2 +-
src/lib/tls/tortls.c | 2 +-
src/lib/trace/debug.h | 2 +-
src/lib/wallclock/include.am | 4 ++--
src/lib/wallclock/{tm_cvt.c => time_to_tm.c} | 6 +++---
src/lib/wallclock/{tm_cvt.h => time_to_tm.h} | 8 ++++----
src/test/fuzz/fuzz_http.c | 2 +-
src/test/fuzz/fuzz_http_connect.c | 2 +-
src/test/log_test_helpers.c | 2 +-
src/test/test-memwipe.c | 2 +-
src/test/test_bt_cl.c | 2 +-
src/test/test_crypto_openssl.c | 2 +-
src/test/test_logging.c | 2 +-
src/test/test_status.c | 2 +-
src/test/test_tortls.c | 2 +-
src/test/test_util_slow.c | 2 +-
src/tools/tor-gencert.c | 4 ++--
src/tools/tor-resolve.c | 4 ++--
src/trunnel/trunnel-local.h | 2 +-
105 files changed, 148 insertions(+), 148 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits