diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:20:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:20:59 -0500 |
| commit | 2cee38f76a46860e2fb29fbd95ba36b332aa38c6 (patch) | |
| tree | 3b2cbaeff1472c8d23c18f3e88bc4735bbb22bcc /src/or/networkstatus.h | |
| parent | b310929ee36f0a88389dca53124506115c850c3b (diff) | |
| parent | 20292ec4974b777d430e7962cc38349c5f82b220 (diff) | |
| download | tor-2cee38f76a46860e2fb29fbd95ba36b332aa38c6.tar.gz tor-2cee38f76a46860e2fb29fbd95ba36b332aa38c6.zip | |
Merge branch 'prop271_030_v1_squashed'
Diffstat (limited to 'src/or/networkstatus.h')
| -rw-r--r-- | src/or/networkstatus.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index d584c2ecfc..edf2dc7b7a 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -115,6 +115,11 @@ int32_t networkstatus_get_param(const networkstatus_t *ns, const char *param_name, int32_t default_val, int32_t min_val, int32_t max_val); +int32_t networkstatus_get_overridable_param(const networkstatus_t *ns, + int32_t torrc_value, + const char *param_name, + int32_t default_val, + int32_t min_val, int32_t max_val); int getinfo_helper_networkstatus(control_connection_t *conn, const char *question, char **answer, const char **errmsg); |