April 2017 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 Apr '17

14 Apr '17

commit 2d55c3f4b6fe67d45e58929fd1d4b44c5281e421 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 14 02:15:35 2017 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index 6797ded..295bb35 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -2,7 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Kryptera webben! Använd HTTPS automatiskt på många webbsidor."> <!ENTITY https-everywhere.about.version "Version"> -<!ENTITY https-everywhere.about.created_by "Skapat av"> +<!ENTITY https-everywhere.about.created_by "Skapad av"> <!ENTITY https-everywhere.about.and ", och"> <!ENTITY https-everywhere.about.librarians "Regelförfattare"> <!ENTITY https-everywhere.about.add_new_rule "Lägg till ny regel">

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 14 Apr '17

14 Apr '17

commit 86a7d4327be650cc96412ca086b8b3ba6e96d517 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 14 02:15:26 2017 +0000 Update translations for whisperback --- sv/sv.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 35a1150..86e986b 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -4,6 +4,7 @@ # # Translators: # cryptohead <cryptohead(a)gmail.com>, 2013 +# Jonatan Nyberg <jonatan(a)autistici.org>, 2017 # Isis, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-21 08:24+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-04-14 01:59+0000\n" +"Last-Translator: Jonatan Nyberg <jonatan(a)autistici.org>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgstr "Ogiltig OpenPGP-nyckel: %s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" -msgstr "Ogiltigt OpenPGP publikt nyckel-block" +msgstr "Ogiltig OpenPGP publikt nyckel block" #: ../whisperBack/exceptions.py:41 #, python-format

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 14 Apr '17

14 Apr '17

commit fd7ec6558f1b89046b6caaea9f56227214b753cf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 14 02:15:21 2017 +0000 Update translations for torcheck_completed --- sv/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sv/torcheck.po b/sv/torcheck.po index 0c1b2a5..4467c9d 100644 --- a/sv/torcheck.po +++ b/sv/torcheck.po @@ -3,19 +3,20 @@ # # Translators: # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 +# Jonatan Nyberg <jonatan(a)autistici.org>, 2017 # mathiasfriman4896b3d1564846bb <mathias.friman(a)regionjamtland.se>, 2012 # Petomatick <petomatick(a)hotmail.com>, 2011 # ph AA, 2015 -# phst <transifex(a)sturman.se>, 2014-2015 -# leveebreaks, 2014 +# phst, 2014-2015 +# Isis, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 # WinterFairy <winterfairy(a)riseup.net>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: phst <transifex(a)sturman.se>\n" +"PO-Revision-Date: 2017-04-14 01:55+0000\n" +"Last-Translator: Jonatan Nyberg <jonatan(a)autistici.org>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +32,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Besök <a href=\"https://www.torproject.org/\">webbplatsen för Tor</a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." +msgstr "Besök <a href=\"https://www.torproject.org/\">Tor webbplatsen</a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." msgid "There is a security update available for Tor Browser." msgstr "Det finns en tillgänglig uppdatering för Tor webbläsare."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 14 Apr '17

14 Apr '17

commit 1f2cb60b172bee58974585a21b8d34475807c4ba Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 14 02:15:17 2017 +0000 Update translations for torcheck --- sv/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sv/torcheck.po b/sv/torcheck.po index 0c1b2a5..4467c9d 100644 --- a/sv/torcheck.po +++ b/sv/torcheck.po @@ -3,19 +3,20 @@ # # Translators: # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 +# Jonatan Nyberg <jonatan(a)autistici.org>, 2017 # mathiasfriman4896b3d1564846bb <mathias.friman(a)regionjamtland.se>, 2012 # Petomatick <petomatick(a)hotmail.com>, 2011 # ph AA, 2015 -# phst <transifex(a)sturman.se>, 2014-2015 -# leveebreaks, 2014 +# phst, 2014-2015 +# Isis, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 # WinterFairy <winterfairy(a)riseup.net>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: phst <transifex(a)sturman.se>\n" +"PO-Revision-Date: 2017-04-14 01:55+0000\n" +"Last-Translator: Jonatan Nyberg <jonatan(a)autistici.org>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +32,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Besök <a href=\"https://www.torproject.org/\">webbplatsen för Tor</a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." +msgstr "Besök <a href=\"https://www.torproject.org/\">Tor webbplatsen</a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." msgid "There is a security update available for Tor Browser." msgstr "Det finns en tillgänglig uppdatering för Tor webbläsare."

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 14 Apr '17

14 Apr '17

commit 109b7ed058d466aeee7082ba0dbac1120fb87e50 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 14 02:15:12 2017 +0000 Update translations for bridgedb_completed --- sv/LC_MESSAGES/bridgedb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 9fb91cb..a715119 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -6,19 +6,20 @@ # Anders Jensen-Urstad <anders(a)unix.se>, 2014 # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 # Gabor Sebastiani, 2014 +# Jonatan Nyberg <jonatan(a)autistici.org>, 2017 # Peter Michanek <peter(a)michanek.se>, 2015 # Petomatick <petomatick(a)hotmail.com>, 2011 # ph AA, 2015 -# phst <transifex(a)sturman.se>, 2014 -# leveebreaks, 2014 +# phst, 2014 +# Isis, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Emil Johansson <emil.a.johansson(a)gmail.com>\n" +"PO-Revision-Date: 2017-04-14 01:57+0000\n" +"Last-Translator: Jonatan Nyberg <jonatan(a)autistici.org>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "Något gick tyvärr fel med din förfrågan." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Rapportera en bugg" +msgstr "Rapportera ett fel" #: bridgedb/https/templates/base.html:82 msgid "Source Code"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 14 Apr '17

14 Apr '17

commit 934c8d144c513b1107b310be4f924bfbf60fe499 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 14 02:15:04 2017 +0000 Update translations for bridgedb --- sv/LC_MESSAGES/bridgedb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 9fb91cb..a715119 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -6,19 +6,20 @@ # Anders Jensen-Urstad <anders(a)unix.se>, 2014 # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 # Gabor Sebastiani, 2014 +# Jonatan Nyberg <jonatan(a)autistici.org>, 2017 # Peter Michanek <peter(a)michanek.se>, 2015 # Petomatick <petomatick(a)hotmail.com>, 2011 # ph AA, 2015 -# phst <transifex(a)sturman.se>, 2014 -# leveebreaks, 2014 +# phst, 2014 +# Isis, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Emil Johansson <emil.a.johansson(a)gmail.com>\n" +"PO-Revision-Date: 2017-04-14 01:57+0000\n" +"Last-Translator: Jonatan Nyberg <jonatan(a)autistici.org>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "Något gick tyvärr fel med din förfrågan." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Rapportera en bugg" +msgstr "Rapportera ett fel" #: bridgedb/https/templates/base.html:82 msgid "Source Code"

1 0

[tor/master] hs: Remove redundant define of ed25519 auth key type
by nickm＠torproject.org 13 Apr '17

13 Apr '17

commit c71670262506cfe75bb439928ce2da2b1ebd30c4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 22 16:59:18 2016 -0500 hs: Remove redundant define of ed25519 auth key type Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_common.h | 3 --- src/or/hs_intropoint.c | 4 ++-- src/or/hs_service.c | 4 +++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/or/hs_common.h b/src/or/hs_common.h index 890797c..400345c 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -17,9 +17,6 @@ /* Version 3 of the protocol (prop224). */ #define HS_VERSION_THREE 3 -/* Denotes ed25519 authentication key on ESTABLISH_INTRO cell. */ -#define AUTH_KEY_ED25519 0x02 - /* String prefix for the signature of ESTABLISH_INTRO */ #define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1" diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index a7282ab..168a89b 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -73,9 +73,9 @@ verify_establish_intro_cell(const hs_cell_establish_intro_t *cell, size_t circuit_key_material_len) { /* We only reach this function if the first byte of the cell is 0x02 which - * means that auth_key_type is AUTH_KEY_ED25519, hence this check should + * means that auth_key_type is of ed25519 type, hence this check should * always pass. See hs_intro_received_establish_intro(). */ - if (BUG(cell->auth_key_type != AUTH_KEY_ED25519)) { + if (BUG(cell->auth_key_type != HS_INTRO_AUTH_KEY_TYPE_ED25519)) { return -1; } diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 52de2bf..5d69a1d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -12,6 +12,7 @@ #include "circuitlist.h" #include "circpathbias.h" +#include "hs_intropoint.h" #include "hs_service.h" #include "hs_common.h" @@ -75,7 +76,8 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material, cell = hs_cell_establish_intro_new(); /* Set AUTH_KEY_TYPE: 2 means ed25519 */ - hs_cell_establish_intro_set_auth_key_type(cell, AUTH_KEY_ED25519); + hs_cell_establish_intro_set_auth_key_type(cell, + HS_INTRO_AUTH_KEY_TYPE_ED25519); /* Set AUTH_KEY_LEN field */ /* Must also set byte-length of AUTH_KEY to match */

1 0

[tor/master] hs: Move service check private dir to hs_common.c
by nickm＠torproject.org 13 Apr '17

13 Apr '17

commit 419c0c07881c71050546c1049173a7eadf936799 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 22 16:40:21 2016 -0500 hs: Move service check private dir to hs_common.c Another building blocks for prop224 service work. This also makes the function takes specific argument instead of the or_option_t object. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_common.c | 34 ++++++++++++++++++++++++++++++++++ src/or/hs_common.h | 4 ++++ src/or/rendservice.c | 35 ++++------------------------------- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 7e0b6ca..4af3081 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -16,6 +16,40 @@ #include "hs_common.h" #include "rendcommon.h" +/* Make sure that the directory for service is private, using the config + * username. + * If create is true: + * - if the directory exists, change permissions if needed, + * - if the directory does not exist, create it with the correct permissions. + * If create is false: + * - if the directory exists, check permissions, + * - if the directory does not exist, check if we think we can create it. + * Return 0 on success, -1 on failure. */ +int +hs_check_service_private_dir(const char *username, const char *path, + unsigned int dir_group_readable, + unsigned int create) +{ + cpd_check_t check_opts = CPD_NONE; + + tor_assert(path); + + if (create) { + check_opts |= CPD_CREATE; + } else { + check_opts |= CPD_CHECK_MODE_ONLY; + check_opts |= CPD_CHECK; + } + if (dir_group_readable) { + check_opts |= CPD_GROUP_READ; + } + /* Check/create directory */ + if (check_private_dir(path, check_opts, username) < 0) { + return -1; + } + return 0; +} + /* Create a new rend_data_t for a specific given version. * Return a pointer to the newly allocated data structure. */ static rend_data_t * diff --git a/src/or/hs_common.h b/src/or/hs_common.h index 7ac2a15..890797c 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -23,6 +23,10 @@ /* String prefix for the signature of ESTABLISH_INTRO */ #define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1" +int hs_check_service_private_dir(const char *username, const char *path, + unsigned int dir_group_readable, + unsigned int create); + void rend_data_free(rend_data_t *data); rend_data_t *rend_data_dup(const rend_data_t *data); rend_data_t *rend_data_client_create(const char *onion_address, diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ac231c2..6b40ed9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -76,9 +76,6 @@ static ssize_t rend_service_parse_intro_for_v3( static int rend_service_check_private_dir(const or_options_t *options, const rend_service_t *s, int create); -static int rend_service_check_private_dir_impl(const or_options_t *options, - const rend_service_t *s, - int create); static const smartlist_t* rend_get_service_list( const smartlist_t* substitute_service_list); static smartlist_t* rend_get_service_list_mutable( @@ -1294,7 +1291,8 @@ poison_new_single_onion_hidden_service_dir_impl(const rend_service_t *service, } /* Make sure the directory was created before calling this function. */ - if (BUG(rend_service_check_private_dir_impl(options, service, 0) < 0)) + if (BUG(hs_check_service_private_dir(options->User, service->directory, + service->dir_group_readable, 0) < 0)) return -1; poison_fname = rend_service_sos_poison_path(service); @@ -1444,32 +1442,6 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/* Implements the directory check from rend_service_check_private_dir, - * without doing the single onion poison checks. */ -static int -rend_service_check_private_dir_impl(const or_options_t *options, - const rend_service_t *s, - int create) -{ - cpd_check_t check_opts = CPD_NONE; - if (create) { - check_opts |= CPD_CREATE; - } else { - check_opts |= CPD_CHECK_MODE_ONLY; - check_opts |= CPD_CHECK; - } - if (s->dir_group_readable) { - check_opts |= CPD_GROUP_READ; - } - /* Check/create directory */ - if (check_private_dir(s->directory, check_opts, options->User) < 0) { - log_warn(LD_REND, "Checking service directory %s failed.", s->directory); - return -1; - } - - return 0; -} - /** Make sure that the directory for s is private, using the config in * options. * If create is true: @@ -1490,7 +1462,8 @@ rend_service_check_private_dir(const or_options_t *options, } /* Check/create directory */ - if (rend_service_check_private_dir_impl(options, s, create) < 0) { + if (hs_check_service_private_dir(options->User, s->directory, + s->dir_group_readable, create) < 0) { return -1; }

1 0

[tor/master] Merge branch 'ticket21891_031_01_squashed'
by nickm＠torproject.org 13 Apr '17

13 Apr '17

commit b081a7ed21ae729f6e195715e130edaca3e0b7fe Merge: ba89520 0565f5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 13 16:43:13 2017 -0400 Merge branch 'ticket21891_031_01_squashed' src/or/hs_common.c | 34 ++++++++++ src/or/hs_common.h | 25 ++++++- src/or/hs_intropoint.c | 4 +- src/or/hs_service.c | 4 +- src/or/rendservice.c | 174 ++++++++++++++++++++++++------------------------- src/or/rendservice.h | 12 +++- src/test/test_hs.c | 20 ++++-- 7 files changed, 173 insertions(+), 100 deletions(-) diff --cc src/or/hs_service.c index 71939e2,5d69a1d..205ef11 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@@ -72,10 -73,11 +73,11 @@@ generate_establish_intro_cell(const uin goto err; } - cell = hs_cell_establish_intro_new(); + cell = trn_cell_establish_intro_new(); /* Set AUTH_KEY_TYPE: 2 means ed25519 */ - trn_cell_establish_intro_set_auth_key_type(cell, AUTH_KEY_ED25519); - hs_cell_establish_intro_set_auth_key_type(cell, - HS_INTRO_AUTH_KEY_TYPE_ED25519); ++ trn_cell_establish_intro_set_auth_key_type(cell, ++ HS_INTRO_AUTH_KEY_TYPE_ED25519); /* Set AUTH_KEY_LEN field */ /* Must also set byte-length of AUTH_KEY to match */

1 0

[tor/master] hs: Move common defines to hs_common.h
by nickm＠torproject.org 13 Apr '17

13 Apr '17

commit e7b7e99cc72e1db14bad471fef69729bdc5eea94 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 22 17:01:07 2016 -0500 hs: Move common defines to hs_common.h Some of those defines will be used by the v3 HS protocol so move them to a common header out of rendservice.c. This is also ground work for prop224 service implementation. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_common.h | 20 ++++++++++++++++++++ src/or/rendservice.c | 17 ----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/or/hs_common.h b/src/or/hs_common.h index 400345c..d7d4228 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -17,6 +17,26 @@ /* Version 3 of the protocol (prop224). */ #define HS_VERSION_THREE 3 +/** Try to maintain this many intro points per service by default. */ +#define NUM_INTRO_POINTS_DEFAULT 3 +/** Maximum number of intro points per service. */ +#define NUM_INTRO_POINTS_MAX 10 +/** Number of extra intro points we launch if our set of intro nodes is empty. + * See proposal 155, section 4. */ +#define NUM_INTRO_POINTS_EXTRA 2 + +/** If we can't build our intro circuits, don't retry for this long. */ +#define INTRO_CIRC_RETRY_PERIOD (60*5) +/** Don't try to build more than this many circuits before giving up for a + * while.*/ +#define MAX_INTRO_CIRCS_PER_PERIOD 10 +/** How many times will a hidden service operator attempt to connect to a + * requested rendezvous point before giving up? */ +#define MAX_REND_FAILURES 1 +/** How many seconds should we spend trying to connect to a requested + * rendezvous point before giving up? */ +#define MAX_REND_TIMEOUT 30 + /* String prefix for the signature of ESTABLISH_INTRO */ #define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1" diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 6b40ed9..9d4dc5b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -98,23 +98,6 @@ struct rend_service_port_config_s { char unix_addr[FLEXIBLE_ARRAY_MEMBER]; }; -/** Try to maintain this many intro points per service by default. */ -#define NUM_INTRO_POINTS_DEFAULT 3 -/** Maximum number of intro points per service. */ -#define NUM_INTRO_POINTS_MAX 10 -/** Number of extra intro points we launch if our set of intro nodes is - * empty. See proposal 155, section 4. */ -#define NUM_INTRO_POINTS_EXTRA 2 - -/** If we can't build our intro circuits, don't retry for this long. */ -#define INTRO_CIRC_RETRY_PERIOD (60*5) -/** How many times will a hidden service operator attempt to connect to - * a requested rendezvous point before giving up? */ -#define MAX_REND_FAILURES 1 -/** How many seconds should we spend trying to connect to a requested - * rendezvous point before giving up? */ -#define MAX_REND_TIMEOUT 30 - /* Hidden service directory file names: * new file names should be added to rend_service_add_filenames_to_list() * for sandboxing purposes. */

1 0