diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | doc/tor.1.in | 3 | ||||
| -rw-r--r-- | src/or/router.c | 3 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
4 files changed, 10 insertions, 8 deletions
@@ -32,10 +32,10 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx in the answers section. Fixes bug 823. Bugfix on 0.2.1.5-alpha. o Major features: - - Directory mirrors now store and serve v2 hidden service descriptors - by default (i.e. new default value for HidServDirectoryV2 is 1). - This is the last step in proposal 114, which aims to make hidden - service connections more reliable. + - Relays now store and serve v2 hidden service descriptors by default + (i.e. new default value for HidServDirectoryV2 is 1). This is the + last step in proposal 114, which aims to make hidden service + connections more reliable. o Minor bugfixes: - Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha. @@ -71,6 +71,8 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx port. Use "getinfo dir/status-vote/current/consensus" to fetch it. - Better logging about stability/reliability calculations on directory servers. + - Drop the requirement to have an open dir port for storing and serving + v2 hidden service descriptors. o Code simplifications and refactoring: - Revise the connection_new functions so that a more typesafe variant diff --git a/doc/tor.1.in b/doc/tor.1.in index 13f3be471..90eb9dd9f 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -1087,7 +1087,8 @@ usage to a file \fBhsusage\fP in its data directory. (Default: 0) .TP \fBHidServDirectoryV2 \fR\fB0\fR|\fB1\fR\fP When this option is set, Tor accepts and serves v2 hidden service -descriptors. (Default: 1) +descriptors. Setting DirPort is not required for this, because clients +connect via the ORPort by default. (Default: 1) .LP .TP \fBBridgeAuthoritativeDir \fR\fB0\fR|\fB1\fR\fP diff --git a/src/or/router.c b/src/or/router.c index 18e8abcfe..1132f9dca 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1702,8 +1702,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, onion_pkey, identity_pkey, family_line, we_are_hibernating() ? "opt hibernating 1\n" : "", - (options->DirPort && options->HidServDirectoryV2) ? - "opt hidden-service-dir\n" : ""); + options->HidServDirectoryV2 ? "opt hidden-service-dir\n" : ""); tor_free(family_line); tor_free(onion_pkey); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 52abe85fc..f39dbf9c6 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4959,7 +4959,7 @@ hid_serv_acting_as_directory(void) routerstatus_t *rs; if (!me) return 0; - if (!get_options()->DirPort || !get_options()->HidServDirectoryV2) { + if (!get_options()->HidServDirectoryV2) { log_info(LD_REND, "We are not acting as hidden service directory, " "because we have not been configured as such."); return 0; |