diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-15 16:43:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-15 16:43:50 -0500 |
| commit | 8569166c70f99bf908e78ce272e71eb60cdc84d0 (patch) | |
| tree | 742aa0d959932c9e22cdacbf23e8d700360adbb0 /src/or/rephist.c | |
| parent | 7f042cbc0a9397c1e5c0f3e9c3bb31ff333d9983 (diff) | |
| parent | 81f4223329a709e5138532b037a58c118b30dd7f (diff) | |
| download | tor-8569166c70f99bf908e78ce272e71eb60cdc84d0.tar.gz tor-8569166c70f99bf908e78ce272e71eb60cdc84d0.zip | |
Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f.
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index f0bac57898..2844c4d74e 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1,5 +1,5 @@ /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2016, The Tor Project, Inc. */ + * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@ -1427,8 +1427,8 @@ find_largest_max(bw_array_t *b) * * Return the smaller of these sums, divided by NUM_SECS_ROLLING_MEASURE. */ -int -rep_hist_bandwidth_assess(void) +MOCK_IMPL(int, +rep_hist_bandwidth_assess,(void)) { uint64_t w,r; r = find_largest_max(read_array); |