diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-20 08:29:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-20 08:29:52 -0400 |
| commit | e9c93a3415fac4660f3976dfcd7cfd2db5502e58 (patch) | |
| tree | 3735c199ce1e6d951f932cb2a04ff1dd0b1ffc5d /src/or/dirserv.h | |
| parent | fb0019daf932f8ec8afeb28156d93ed0269c4ec6 (diff) | |
| parent | 0a6f4627a4292e4bed94cc1b44b6f53fc8f9ce37 (diff) | |
| download | tor-e9c93a3415fac4660f3976dfcd7cfd2db5502e58.tar.gz tor-e9c93a3415fac4660f3976dfcd7cfd2db5502e58.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/or/dirserv.h')
| -rw-r--r-- | src/or/dirserv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirserv.h b/src/or/dirserv.h index dda5b35bc8..61f4af4b50 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -182,7 +182,8 @@ STATIC void dirserv_set_routerstatus_testing(routerstatus_t *rs); /* Put the MAX_MEASUREMENT_AGE #define here so unit tests can see it */ #define MAX_MEASUREMENT_AGE (3*24*60*60) /* 3 days */ -STATIC int measured_bw_line_parse(measured_bw_line_t *out, const char *line); +STATIC int measured_bw_line_parse(measured_bw_line_t *out, const char *line, + int line_is_after_headers); STATIC int measured_bw_line_apply(measured_bw_line_t *parsed_line, smartlist_t *routerstatuses); |