summaryrefslogtreecommitdiff
path: root/src/or/config.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-03 12:52:26 -0400
committerNick Mathewson <nickm@torproject.org>2016-08-03 12:52:26 -0400
commitf5dcab8072e4f8471cc0d4d8a28c79272467fb92 (patch)
treeb5ea4d3611c535bd5c617b06dcab4595f6adc3e1 /src/or/config.h
parentf3314aa6e1e307467a684f1477e2af1568a728b6 (diff)
downloadtor-f5dcab8072e4f8471cc0d4d8a28c79272467fb92.tar.gz
tor-f5dcab8072e4f8471cc0d4d8a28c79272467fb92.zip
Add new warn_deprecated option to config_assign*().
Also, collapse all the config_assign*() options into a flags argument, since having two boolean arguments was already confusing.
Diffstat (limited to 'src/or/config.h')
-rw-r--r--src/or/config.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.h b/src/or/config.h
index a0fe6e4805..9d020b37b9 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -29,8 +29,8 @@ const char *escaped_safe_str_client(const char *address);
const char *escaped_safe_str(const char *address);
const char *get_version(void);
const char *get_short_version(void);
-setopt_err_t options_trial_assign(config_line_t *list, int use_defaults,
- int clear_first, char **msg);
+setopt_err_t options_trial_assign(config_line_t *list, unsigned flags,
+ char **msg);
uint32_t get_last_resolved_addr(void);
void reset_last_resolved_addr(void);