summaryrefslogtreecommitdiff
path: root/src/app/config/config.h
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-03-21 03:50:36 +1000
committerteor <teor@torproject.org>2020-03-21 03:50:36 +1000
commit2962c32b7a60b78f4d470bf063f8b1454b56506b (patch)
treea17e7f5655386190cc0fb58e420c884e1df034a2 /src/app/config/config.h
parent42ea03eb7f7e380016ed5440697a81cebe731aa1 (diff)
parent96ca14d98924fec8a18a592c491900a9142f6e71 (diff)
downloadtor-2962c32b7a60b78f4d470bf063f8b1454b56506b.tar.gz
tor-2962c32b7a60b78f4d470bf063f8b1454b56506b.zip
Merge branch 'bug32588_035' into bug32588_041
Merge tests from maint-0.4.1 with new tests from bug32588_035 in test_router.c.
Diffstat (limited to 'src/app/config/config.h')
-rw-r--r--src/app/config/config.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 46db02f944..e74f11cf8b 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -293,6 +293,10 @@ STATIC int open_and_add_file_log(const log_severity_list_t *severity,
const char *fname,
int truncate_log);
+STATIC int parse_ports(or_options_t *options, int validate_only,
+ char **msg, int *n_ports_out,
+ int *world_writable_control_socket);
+
#endif /* defined(CONFIG_PRIVATE) */
#endif /* !defined(TOR_CONFIG_H) */