diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-04 10:54:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-04 10:54:54 -0500 |
| commit | 46118d7d7542aa960a26a08d9d5fbac33698765c (patch) | |
| tree | 12b52cfd6bbec9ab8b29d97ec585c2a6c162f61b /src/common/compat_libevent.h | |
| parent | 05d8111eedee9e11e4bb1c42e93ae2fc168d52ec (diff) | |
| parent | 833d027778ba97020fb5ded1d94e4b21fbcab766 (diff) | |
| download | tor-46118d7d7542aa960a26a08d9d5fbac33698765c.tar.gz tor-46118d7d7542aa960a26a08d9d5fbac33698765c.zip | |
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
Conflicts:
src/or/relay.c
Diffstat (limited to 'src/common/compat_libevent.h')
| -rw-r--r-- | src/common/compat_libevent.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 2472e2c49e..b5f6445471 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -90,6 +90,7 @@ int tor_add_bufferevent_to_rate_limit_group(struct bufferevent *bev, void tor_gettimeofday_cached(struct timeval *tv); void tor_gettimeofday_cache_clear(void); +void tor_gettimeofday_cached_monotonic(struct timeval *tv); #endif |