diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-05-11 18:15:43 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-05-11 18:15:43 -0400 |
commit | aab626405c312a33d521c9ca3729552fd9ccca2e (patch) | |
tree | f4b833bd3818a48b7a642ff5066ca0ec4ccfc0bb /src/or/connection.c | |
parent | b3e591dca1a7343a49bc949e8f75a242efb7fb72 (diff) | |
parent | de343b4e421c0c651eaac1d52d23c3c792bee73a (diff) | |
download | tor-aab626405c312a33d521c9ca3729552fd9ccca2e.tar.gz tor-aab626405c312a33d521c9ca3729552fd9ccca2e.zip |
Merge remote-tracking branch 'catalyst-github/bug25756'
Diffstat (limited to 'src/or/connection.c')
-rw-r--r-- | src/or/connection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 3462dbeac2..5185b45b14 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -5234,10 +5234,10 @@ connection_free_all(void) * that we had more faith in and therefore the warning level should have higher * severity. */ -void -clock_skew_warning(const connection_t *conn, long apparent_skew, int trusted, - log_domain_mask_t domain, const char *received, - const char *source) +MOCK_IMPL(void, +clock_skew_warning, (const connection_t *conn, long apparent_skew, int trusted, + log_domain_mask_t domain, const char *received, + const char *source)) { char dbuf[64]; char *ext_source = NULL, *warn = NULL; |