summaryrefslogtreecommitdiff
path: root/src/app/config/config.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-02-08 08:37:46 -0500
committerNick Mathewson <nickm@torproject.org>2019-02-08 08:37:46 -0500
commit7f59b9fb1fdc4519e663fa82e416eccae88e8934 (patch)
treeb7835f898ac1cd47a0e02bea5da20c6eee017733 /src/app/config/config.h
parentb1ae2fd65ba165722dc121df7bb0be4ec5d6597c (diff)
parentab6534781996404ca57e9f5b0cbdda998579c329 (diff)
downloadtor-7f59b9fb1fdc4519e663fa82e416eccae88e8934.tar.gz
tor-7f59b9fb1fdc4519e663fa82e416eccae88e8934.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/app/config/config.h')
-rw-r--r--src/app/config/config.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/app/config/config.h b/src/app/config/config.h
index b3b3150825..46db02f944 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -141,6 +141,16 @@ MOCK_DECL(char *,
#define get_cachedir_fname_suffix(sub1, suffix) \
options_get_cachedir_fname2_suffix(get_options(), (sub1), NULL, (suffix))
+#define safe_str_client(address) \
+ safe_str_client_opts(NULL, address)
+#define safe_str(address) \
+ safe_str_opts(NULL, address)
+
+const char * safe_str_client_opts(const or_options_t *options,
+ const char *address);
+const char * safe_str_opts(const or_options_t *options,
+ const char *address);
+
int using_default_dir_authorities(const or_options_t *options);
int create_keys_directory(const or_options_t *options);