diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-10 15:52:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-10 15:52:04 -0500 |
| commit | f1a004797e6dda71f75ddec8871c0e516eccfbbb (patch) | |
| tree | 8edcb0c614e6dfd8a64f9ec3bbcba1a3917fed99 /src | |
| parent | cc9809c1f79344f2419195ce1b01d210da8faa67 (diff) | |
| parent | 20d493308a50d3acc10ba27ac78d4258045f8ede (diff) | |
| download | tor-f1a004797e6dda71f75ddec8871c0e516eccfbbb.tar.gz tor-f1a004797e6dda71f75ddec8871c0e516eccfbbb.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
doc/tor.1.txt
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 aadcbec319..3f102245fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2889,7 +2889,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 |