summaryrefslogtreecommitdiff
path: root/src/or/config.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-24 19:35:28 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-24 19:35:28 -0400
commit594cf92498c8ea12dc0b19f743d6b88d4a98f1eb (patch)
treec4358510a57824e1b21b5de6adfdfff30626e027 /src/or/config.h
parent122a7f8848785e3cefef812749c7ec1844b26402 (diff)
parent02cde0d9398c43de3a67133b7982d9df6962fe32 (diff)
downloadtor-594cf92498c8ea12dc0b19f743d6b88d4a98f1eb.tar.gz
tor-594cf92498c8ea12dc0b19f743d6b88d4a98f1eb.zip
Merge branch 'feature18329_029_squashed' into maint-0.3.2
Diffstat (limited to 'src/or/config.h')
-rw-r--r--src/or/config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.h b/src/or/config.h
index af945f16be..efdd8c59b0 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -203,6 +203,8 @@ STATIC int parse_port_config(smartlist_t *out,
const char *defaultaddr,
int defaultport,
const unsigned flags);
+
+STATIC int check_bridge_distribution_setting(const char *bd);
#endif /* defined(CONFIG_PRIVATE) */
#endif /* !defined(TOR_CONFIG_H) */