aboutsummaryrefslogtreecommitdiff
path: root/src/common/compat_libevent.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-04 11:00:02 -0500
committerNick Mathewson <nickm@torproject.org>2014-03-04 11:00:02 -0500
commitbb375442141b4a5b301212394ce3e106cb34daf2 (patch)
tree96a5baed08b8212b1b719e8ad72507d76e34bb99 /src/common/compat_libevent.h
parentc8d41da52d6ae1edd1c4999e328b1e7eadc0ab5b (diff)
parent46118d7d7542aa960a26a08d9d5fbac33698765c (diff)
downloadtor-bb375442141b4a5b301212394ce3e106cb34daf2.tar.gz
tor-bb375442141b4a5b301212394ce3e106cb34daf2.zip
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
Conflicts: src/common/compat_libevent.h src/or/relay.c
Diffstat (limited to 'src/common/compat_libevent.h')
-rw-r--r--src/common/compat_libevent.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h
index 17e0523789..f0d1828b7b 100644
--- a/src/common/compat_libevent.h
+++ b/src/common/compat_libevent.h
@@ -94,6 +94,7 @@ void tor_gettimeofday_cache_clear(void);
#ifdef TOR_UNIT_TESTS
void tor_gettimeofday_cache_set(const struct timeval *tv);
#endif
+void tor_gettimeofday_cached_monotonic(struct timeval *tv);
#endif