diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-15 16:54:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-15 16:54:16 -0500 |
| commit | cbe04d455016233f4759fe281c07dd7db6096c2a (patch) | |
| tree | cf2cf763643f9a807ebdce2abab86ef98ce38434 /src/or/rephist.c | |
| parent | aebe8a82c9a1a8ee1df9d1dbb82807d342f49203 (diff) | |
| parent | 8569166c70f99bf908e78ce272e71eb60cdc84d0 (diff) | |
| download | tor-cbe04d455016233f4759fe281c07dd7db6096c2a.tar.gz tor-cbe04d455016233f4759fe281c07dd7db6096c2a.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.3
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index 43494692cb..67e4d3150f 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-2017, The Tor Project, Inc. */ + * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@ -1203,8 +1203,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); @@ -3205,4 +3205,3 @@ rep_hist_free_all(void) tor_assert_nonfatal(rephist_total_alloc == 0); tor_assert_nonfatal_once(rephist_total_num == 0); } - |