diff options
author | Robert Ransom <rransom.8774@gmail.com> | 2011-02-09 03:05:21 -0800 |
---|---|---|
committer | Robert Ransom <rransom.8774@gmail.com> | 2011-02-09 03:05:21 -0800 |
commit | 449d895f0602de38cf4ec6e10457419f69bd533b (patch) | |
tree | 8b889c3f3869e7f82b8f178b9320f5b71769e611 /src | |
parent | d43470ad8a6b82e3d8a5aa0c1beb729fa65859b5 (diff) | |
parent | 7bf06d4a4f390aa866f9137b364632f5d6f3df8a (diff) | |
download | tor-449d895f0602de38cf4ec6e10457419f69bd533b.tar.gz tor-449d895f0602de38cf4ec6e10457419f69bd533b.zip |
Merge branch 'bug2408-v2-021-common' into bug2408-v2-022
Diffstat (limited to 'src')
-rw-r--r-- | src/or/config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index eae92b2408..ec86dbca56 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2841,7 +2841,9 @@ compute_publishserverdescriptor(or_options_t *options) else if (!strcasecmp(string, "bridge")) *auth |= BRIDGE_AUTHORITY; else if (!strcasecmp(string, "hidserv")) - *auth |= HIDSERV_AUTHORITY; + log_warn(LD_CONFIG, + "PublishServerDescriptor hidserv is invalid. See " + "PublishHidServDescriptors."); else if (!strcasecmp(string, "") || !strcmp(string, "0")) /* no authority */; else |