- tor-commits - lists.torproject.org

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 05 May '16

05 May '16

commit c10d03be5b63a7da445f88937553fb1d74471057 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 12:45:52 2016 +0000 Update translations for tails-misc_completed --- sv.po | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sv.po b/sv.po index 8734e18..fba8b46 100644 --- a/sv.po +++ b/sv.po @@ -3,7 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Anders Nilsson <locally(a)devode.se>, 2015 +# Anders Nilsson <anders(a)devode.se>, 2016 +# Anders Nilsson <anders(a)devode.se>, 2015 # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 # Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Gabor Sebastiani, 2014 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: pilino1234 <mhilgendrf(a)aol.com>\n" +"POT-Creation-Date: 2016-04-25 14:02+0200\n" +"PO-Revision-Date: 2016-05-05 12:15+0000\n" +"Last-Translator: Anders Nilsson <anders(a)devode.se>\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" @@ -69,13 +70,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Vill du starta Electrum ändå?" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:30 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Starta" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:31 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Avsluta" @@ -237,17 +238,24 @@ msgstr "Utmatning från GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Andra meddelanden givna av GnuPG:" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "The Claws Mail persistence feature is activated." msgstr "Claws Mail persistens funktionen är aktiverad." -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:22 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "Om du har sparat e-postmeddelanden i Claws Mail borde du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrera din data</a> innan du startar Icedove." +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Om du redan har flyttat din e-post till Icedove, borde du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>radera all din Claws Mail-data</a> för att ta bort den här varningen." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Starta om"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 May '16

05 May '16

commit 449a5a51d766d1ce68743eb775f8fcefd6bb77d5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 12:45:49 2016 +0000 Update translations for tails-misc --- sv.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index a9c2aef..fba8b46 100644 --- a/sv.po +++ b/sv.po @@ -3,7 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Anders Nilsson <locally(a)devode.se>, 2015 +# Anders Nilsson <anders(a)devode.se>, 2016 +# Anders Nilsson <anders(a)devode.se>, 2015 # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 # Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Gabor Sebastiani, 2014 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-Revision-Date: 2016-04-26 09:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-05-05 12:15+0000\n" +"Last-Translator: Anders Nilsson <anders(a)devode.se>\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" @@ -253,7 +254,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Om du redan har flyttat din e-post till Icedove, borde du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>radera all din Claws Mail-data</a> för att ta bort den här varningen." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 05 May '16

05 May '16

commit add148fc2cf7226c0cb5ea9cc8db2ca316c08ec5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 12:45:46 2016 +0000 Update translations for tor-launcher-network-settings_completed --- sv/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd index 31b3ac3..aab93e0 100644 --- a/sv/network-settings.dtd +++ b/sv/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet"> <!ENTITY torsettings.bridgeHelpTitle "Hjälp om bryggor"> <!ENTITY torsettings.bridgeHelp1 "Om du inte kan ansluta till Tor-nätverket är det möjligt att din internetleverantör eller annan myndighet blockerar Tor.  Ofta kan du kringgå detta problem genom att använda Tor-bryggor, vilka är olistade reläer som är mer svårblockerade."> -<!ENTITY torsettings.bridgeHelp1B "Du kan använda de förkonfigurerade bryggadresserna, eller skaffa bryggadresser själv på något av följande sätt:"> +<!ENTITY torsettings.bridgeHelp1B "Du kan använda de förinställda adresserna till bryggor, eller hämta egna adresser genom att använda en av dessa metoder:"> <!ENTITY torsettings.bridgeHelp2Heading "Via nätet"> <!ENTITY torsettings.bridgeHelp2 "Använd en webbläsare för att besöka https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 May '16

05 May '16

commit f85c03faee9f5fe260b1d4697e25bb9a52588e08 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 12:45:43 2016 +0000 Update translations for tor-launcher-network-settings --- sv/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd index 5c398b3..aab93e0 100644 --- a/sv/network-settings.dtd +++ b/sv/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet"> <!ENTITY torsettings.bridgeHelpTitle "Hjälp om bryggor"> <!ENTITY torsettings.bridgeHelp1 "Om du inte kan ansluta till Tor-nätverket är det möjligt att din internetleverantör eller annan myndighet blockerar Tor.  Ofta kan du kringgå detta problem genom att använda Tor-bryggor, vilka är olistade reläer som är mer svårblockerade."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Du kan använda de förinställda adresserna till bryggor, eller hämta egna adresser genom att använda en av dessa metoder:"> <!ENTITY torsettings.bridgeHelp2Heading "Via nätet"> <!ENTITY torsettings.bridgeHelp2 "Använd en webbläsare för att besöka https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 05 May '16

05 May '16

commit fcabf93af4c8371186ca1043e937343eaa31751c Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 12:45:26 2016 +0000 Update translations for tails-persistence-setup_completed --- sv/sv.po | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 6121504..c0e31b4 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -3,7 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Anders Nilsson <locally(a)devode.se>, 2015 +# Anders Nilsson <anders(a)devode.se>, 2016 +# Anders Nilsson <anders(a)devode.se>, 2015 # Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Michael Cavén, 2014 # phst <transifex(a)sturman.se>, 2014 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-25 17:34+0100\n" -"PO-Revision-Date: 2016-03-21 16:32+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-04-24 16:40+0200\n" +"PO-Revision-Date: 2016-05-05 12:18+0000\n" +"Last-Translator: Anders Nilsson <anders(a)devode.se>\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" @@ -121,10 +122,18 @@ msgid "Lists downloaded by APT" msgstr "Listor hämtade av APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 +msgid "Mumble server" +msgstr "Mumble-server" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 +msgid "Mumble server configuration and its Tor Hidden Service address" +msgstr "Mumble-serverkonfiguration och dess Tor Hidden Service-adress" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Dotfiles" msgstr "Punktfiler" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:180 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Länka in i $HOME varje fil och katalog som finns i `dotfiles' katalogen"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 05 May '16

05 May '16

commit 2bace857df8e8d576fc2e102a78368cd51c4eca3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 12:45:23 2016 +0000 Update translations for tails-persistence-setup --- sv/sv.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 38bffc6..c0e31b4 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -3,7 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Anders Nilsson <locally(a)devode.se>, 2015 +# Anders Nilsson <anders(a)devode.se>, 2016 +# Anders Nilsson <anders(a)devode.se>, 2015 # Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Michael Cavén, 2014 # phst <transifex(a)sturman.se>, 2014 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-04-24 16:40+0200\n" -"PO-Revision-Date: 2016-04-25 08:33+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-05-05 12:18+0000\n" +"Last-Translator: Anders Nilsson <anders(a)devode.se>\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" @@ -122,11 +123,11 @@ msgstr "Listor hämtade av APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Mumble server" -msgstr "" +msgstr "Mumble-server" #: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "Mumble server configuration and its Tor Hidden Service address" -msgstr "" +msgstr "Mumble-serverkonfiguration och dess Tor Hidden Service-adress" #: ../lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Dotfiles"

1 0

[tor/master] Only choose directory DirPorts on relays
by nickm＠torproject.org 05 May '16

05 May '16

commit 9aa280cc0c105bc282c3c1c0dee385387251ab12 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 16:07:47 2016 +1000 Only choose directory DirPorts on relays --- src/or/directory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index a03283e..8dc018a 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -630,6 +630,7 @@ directory_choose_address_routerstatus(const routerstatus_t *status, tor_assert(use_or_ap != NULL); tor_assert(use_dir_ap != NULL); + const or_options_t *options = get_options(); int have_or = 0, have_dir = 0; /* We expect status to have at least one reachable address if we're @@ -671,10 +672,11 @@ directory_choose_address_routerstatus(const routerstatus_t *status, } /* DirPort connections - * DIRIND_ONEHOP uses ORPort, but may fall back to the DirPort */ + * DIRIND_ONEHOP uses ORPort, but may fall back to the DirPort on relays */ if (indirection == DIRIND_DIRECT_CONN || indirection == DIRIND_ANON_DIRPORT || - indirection == DIRIND_ONEHOP) { + (indirection == DIRIND_ONEHOP + && !directory_must_use_begindir(options))) { have_dir = fascist_firewall_choose_address_rs(status, FIREWALL_DIR_CONNECTION, 0, use_dir_ap);

1 0

[tor/master] Rename skip_or and skip_dir to avoid confusion
by nickm＠torproject.org 05 May '16

05 May '16

commit 7ec273bd4a3c82d9bddc9aef373b4f99396198c9 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 15:44:31 2016 +1000 Rename skip_or and skip_dir to avoid confusion Variable rename only --- src/or/routerlist.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 97512d7..13739a7 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1685,8 +1685,8 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or = router_skip_or_reachability(options, try_ip_pref); - const int skip_dir = router_skip_dir_reachability(options, try_ip_pref); + const int skip_or_fw = router_skip_or_reachability(options, try_ip_pref); + const int skip_dir_fw = router_skip_dir_reachability(options, try_ip_pref); const int must_have_or = directory_must_use_begindir(options); /* Find all the running dirservers we know about. */ @@ -1739,12 +1739,12 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, * address for each router (if any). (To ensure correct load-balancing * we try routers that only have one address both times.) */ - if (!fascistfirewall || skip_or || + if (!fascistfirewall || skip_or_fw || fascist_firewall_allows_rs(status, FIREWALL_OR_CONNECTION, try_ip_pref)) smartlist_add(is_trusted ? trusted_tunnel : is_overloaded ? overloaded_tunnel : tunnel, (void*)node); - else if (!must_have_or && (skip_dir || + else if (!must_have_or && (skip_dir_fw || fascist_firewall_allows_rs(status, FIREWALL_DIR_CONNECTION, try_ip_pref))) smartlist_add(is_trusted ? trusted_direct : @@ -1848,8 +1848,8 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or = router_skip_or_reachability(options, try_ip_pref); - const int skip_dir = router_skip_dir_reachability(options, try_ip_pref); + const int skip_or_fw = router_skip_or_reachability(options, try_ip_pref); + const int skip_dir_fw = router_skip_dir_reachability(options, try_ip_pref); const int must_have_or = directory_must_use_begindir(options); SMARTLIST_FOREACH_BEGIN(sourcelist, const dir_server_t *, d) @@ -1886,11 +1886,11 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, * address for each router (if any). (To ensure correct load-balancing * we try routers that only have one address both times.) */ - if (!fascistfirewall || skip_or || + if (!fascistfirewall || skip_or_fw || fascist_firewall_allows_dir_server(d, FIREWALL_OR_CONNECTION, try_ip_pref)) smartlist_add(is_overloaded ? overloaded_tunnel : tunnel, (void*)d); - else if (!must_have_or && (skip_dir || + else if (!must_have_or && (skip_dir_fw || fascist_firewall_allows_dir_server(d, FIREWALL_DIR_CONNECTION, try_ip_pref))) smartlist_add(is_overloaded ? overloaded_direct : direct, (void*)d);

1 0

[tor/master] Make clients only select directories with reachable ORPorts
by nickm＠torproject.org 05 May '16

05 May '16

commit 88deb52d559fbec17be4a634137ac4b6c207ce06 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 15:40:04 2016 +1000 Make clients only select directories with reachable ORPorts This makes sure clients will only select relays which support begindir over ORPort. --- src/or/routerlist.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3c9023e..6a293b7 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1689,6 +1689,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, const int skip_or = router_skip_or_reachability(options, try_ip_pref); const int skip_dir = router_skip_dir_reachability(options, try_ip_pref); + const int must_have_or = directory_must_use_begindir(options); /* Find all the running dirservers we know about. */ SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), const node_t *, node) { @@ -1745,9 +1746,9 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, try_ip_pref)) smartlist_add(is_trusted ? trusted_tunnel : is_overloaded ? overloaded_tunnel : tunnel, (void*)node); - else if (skip_dir || + else if (!must_have_or && (skip_dir || fascist_firewall_allows_rs(status, FIREWALL_DIR_CONNECTION, - try_ip_pref)) + try_ip_pref))) smartlist_add(is_trusted ? trusted_direct : is_overloaded ? overloaded_direct : direct, (void*)node); else if (!tor_addr_is_null(&status->ipv6_addr)) @@ -1853,6 +1854,7 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, const int skip_or = router_skip_or_reachability(options, try_ip_pref); const int skip_dir = router_skip_dir_reachability(options, try_ip_pref); + const int must_have_or = directory_must_use_begindir(options); SMARTLIST_FOREACH_BEGIN(sourcelist, const dir_server_t *, d) { @@ -1892,9 +1894,9 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, fascist_firewall_allows_dir_server(d, FIREWALL_OR_CONNECTION, try_ip_pref)) smartlist_add(is_overloaded ? overloaded_tunnel : tunnel, (void*)d); - else if (skip_dir || + else if (!must_have_or && (skip_dir || fascist_firewall_allows_dir_server(d, FIREWALL_DIR_CONNECTION, - try_ip_pref)) + try_ip_pref))) smartlist_add(is_overloaded ? overloaded_direct : direct, (void*)d); else if (!tor_addr_is_null(&d->ipv6_addr)) ++n_not_preferred;

1 0

[tor/master] Merge branch 'feature18483-028-v2-squashed' into maint-0.2.8
by nickm＠torproject.org 05 May '16

05 May '16

commit 68d913c49c7aff441fc6671406aee5137f36f620 Merge: 2e5b35d 9aa280c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 08:16:36 2016 -0400 Merge branch 'feature18483-028-v2-squashed' into maint-0.2.8 changes/feature18483 | 4 ++++ src/or/directory.c | 67 ++++++++++++++++++++++++++++++++++++++++++++-------- src/or/directory.h | 6 +++-- src/or/routerlist.c | 10 ++++---- 4 files changed, 71 insertions(+), 16 deletions(-) diff --cc src/or/routerlist.c index 2167ae2,6a293b7..97512d7 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -1743,11 -1746,13 +1744,11 @@@ router_pick_directory_server_impl(dirin try_ip_pref)) smartlist_add(is_trusted ? trusted_tunnel : is_overloaded ? overloaded_tunnel : tunnel, (void*)node); - else if (skip_dir || + else if (!must_have_or && (skip_dir || fascist_firewall_allows_rs(status, FIREWALL_DIR_CONNECTION, - try_ip_pref)) + try_ip_pref))) smartlist_add(is_trusted ? trusted_direct : is_overloaded ? overloaded_direct : direct, (void*)node); - else if (!tor_addr_is_null(&status->ipv6_addr)) - ++n_not_preferred; } SMARTLIST_FOREACH_END(node); if (smartlist_len(tunnel)) { @@@ -1888,10 -1894,12 +1890,10 @@@ router_pick_trusteddirserver_impl(cons fascist_firewall_allows_dir_server(d, FIREWALL_OR_CONNECTION, try_ip_pref)) smartlist_add(is_overloaded ? overloaded_tunnel : tunnel, (void*)d); - else if (skip_dir || + else if (!must_have_or && (skip_dir || fascist_firewall_allows_dir_server(d, FIREWALL_DIR_CONNECTION, - try_ip_pref)) + try_ip_pref))) smartlist_add(is_overloaded ? overloaded_direct : direct, (void*)d); - else if (!tor_addr_is_null(&d->ipv6_addr)) - ++n_not_preferred; } SMARTLIST_FOREACH_END(d);

1 0