mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 02:09:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source 
Conflicts:
	doc/tor.1.txt
This commit is contained in:
Nick Mathewson 2011-02-10 15:52:04 -05:00
commit f1a004797e
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug2408 Normal file
View File

@ -0,0 +1,6 @@
o Major bugfixes
- Ignore and warn about "PublishServerDescriptor hidserv" torrc
options. The 'hidserv' argument never controlled publication
of hidden service descriptors. Bugfix on 0.2.0.1-alpha.

6
doc/tor.1.txt
View File

@ -909,9 +909,9 @@ is non-zero):
If set to a path, only the specified path will be executed. If set to a path, only the specified path will be executed.
(Default: tor-fw-helper) (Default: tor-fw-helper)
**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**:: **PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**,**...**::
This option specifies which descriptors Tor will publish when acting as This option specifies which descriptors Tor will publish when acting as
a relay or hidden service. You can a relay. You can
choose multiple arguments, separated by commas. choose multiple arguments, separated by commas.
+ +
If this option is set to 0, Tor will not publish its If this option is set to 0, Tor will not publish its
@ -919,7 +919,7 @@ is non-zero):
out your server, or if you're using a Tor controller that handles directory out your server, or if you're using a Tor controller that handles directory
publishing for you.) Otherwise, Tor will publish its descriptors of all publishing for you.) Otherwise, Tor will publish its descriptors of all
type(s) specified. The default is "1", type(s) specified. The default is "1",
which means "if running as a server or a hidden service, publish the which means "if running as a server, publish the
appropriate descriptors to the authorities". appropriate descriptors to the authorities".
**ShutdownWaitLength** __NUM__:: **ShutdownWaitLength** __NUM__::

4
src/or/config.c
View File

@ -2889,7 +2889,9 @@ compute_publishserverdescriptor(or_options_t *options)
else if (!strcasecmp(string, "bridge")) else if (!strcasecmp(string, "bridge"))
*auth |= BRIDGE_AUTHORITY; *auth |= BRIDGE_AUTHORITY;
else if (!strcasecmp(string, "hidserv")) 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")) else if (!strcasecmp(string, "") || !strcmp(string, "0"))
/* no authority */; /* no authority */;
else else