[tor-commits] [tor/master] Merge remote-tracking branch 'github/eliminate_gettimeofday_cached'
nickm at torproject.org
nickm at torproject.org
Tue May 1 17:28:24 UTC 2018
commit 5c5392fea75ea4386466a62dc52cfb1a80d9c14a
Merge: 60a2c92d1 9abf541f7
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue May 1 13:27:02 2018 -0400
Merge remote-tracking branch 'github/eliminate_gettimeofday_cached'
changes/ticket25927.1 | 6 ++++
changes/ticket25927.2 | 5 +++
src/common/compat_libevent.c | 47 +--------------------------
src/common/compat_libevent.h | 3 --
src/common/compat_time.c | 50 +++++++++++++++++++++++++++++
src/common/compat_time.h | 27 ++++++++++++++++
src/or/circuitmux_ewma.c | 76 ++++++++++++++++++++++++++++++++------------
src/or/circuitmux_ewma.h | 7 ++++
src/or/connection.c | 2 --
src/or/main.c | 2 ++
src/test/test_channel.c | 2 ++
src/test/test_circuitmux.c | 40 +++++++++++++++++++++++
src/test/test_util.c | 5 +++
13 files changed, 200 insertions(+), 72 deletions(-)
More information about the tor-commits
mailing list