- tor-commits - lists.torproject.org

[onionperf/master] Make -o/-i arguments mutually exclusive.
by karsten＠torproject.org 05 Jun '20

05 Jun '20

commit 2a506d6ab1c626d70f00d45fb310c0c59bca4907 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 26 23:05:02 2020 +0200 Make -o/-i arguments mutually exclusive. Right now, it's possible to specify both -o and -i at the same time, which doesn't make any sense. Also, it's rather non-intuitive that both argument defaults are True and that setting either of them changes their value to False. This patch fixes both issues above. Fixes #34316. --- onionperf/onionperf | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index f430c3f..bc95e2b 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -194,15 +194,17 @@ def main(): action="store", dest="tgenconnectport", default=8080) - measure_parser.add_argument('-o', '--onion-only', - help="""disable measuring download times over Tor back to {0}""".format(hostname), - action="store_false", dest="do_inet", - default=True) + onion_or_inet_only_group = measure_parser.add_mutually_exclusive_group() - measure_parser.add_argument('-i', '--inet-only', - help="""disable measuring download times over Tor to an ephemeral onion service""", - action="store_false", dest="do_onion", - default=True) + onion_or_inet_only_group.add_argument('-o', '--onion-only', + help="""only measure download times over Tor to an ephemeral onion service""", + action="store_true", dest="onion_only", + default=False) + + onion_or_inet_only_group.add_argument('-i', '--inet-only', + help="""only measure download times over Tor exiting to a public webserver""", + action="store_true", dest="inet_only", + default=False) measure_parser.add_argument('-n', '--nickname', help="""the 'SOURCE' STRING to use in measurement result files produced by OnionPerf""", @@ -352,7 +354,7 @@ def measure(args): server_tor_socks_port = util.get_random_free_port() meas = Measurement(args.torpath, args.tgenpath, args.prefix, args.private_prefix, args.nickname, args.oneshot, args.additional_client_conf, args.torclient_conf_file, args.torserver_conf_file) - meas.run(do_onion=args.do_onion, do_inet=args.do_inet, + meas.run(do_onion=not args.inet_only, do_inet=not args.onion_only, client_tgen_listen_port=client_tgen_port, client_tgen_connect_ip=client_connect_ip, client_tgen_connect_port=client_connect_port, client_tor_ctl_port=client_tor_ctl_port, client_tor_socks_port=client_tor_socks_port, server_tgen_listen_port=server_tgen_port, server_tor_ctl_port=server_tor_ctl_port, server_tor_socks_port=server_tor_socks_port) else:

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit 29a33410cd2033dfb9605a163d8803b9dcd9167f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 00:15:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- en_GB/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po index c42e4947b6..33f0663d2a 100644 --- a/en_GB/LC_MESSAGES/bridgedb.po +++ b/en_GB/LC_MESSAGES/bridgedb.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-06-05 00:09+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,7 +93,7 @@ msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB encountered an error." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[bridgedb/develop] Merge branch 'enhancement/19774' into develop
by phw＠torproject.org 04 Jun '20

04 Jun '20

commit 6d3e899925854b0994d66551fef25678e6f36561 Merge: c45439c 20f1049 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Jun 4 14:05:25 2020 -0700 Merge branch 'enhancement/19774' into develop CHANGELOG | 3 +++ .../https/templates/assets/images/favicon.ico | Bin 0 -> 4286 bytes bridgedb/distributors/https/templates/base.html | 1 + setup.py | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-)

1 0

[bridgedb/develop] Add favicon to BridgeDB's web UI.
by phw＠torproject.org 04 Jun '20

04 Jun '20

commit 20f104955c6b798c7452d7ee09ae45fbbc99c62d Author: Philipp Winter <phw(a)nymity.ch> Date: Thu May 28 13:50:02 2020 -0700 Add favicon to BridgeDB's web UI. This fixes <https://bugs.torproject.org/19774>. --- CHANGELOG | 3 +++ .../https/templates/assets/images/favicon.ico | Bin 0 -> 4286 bytes bridgedb/distributors/https/templates/base.html | 1 + setup.py | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6dfa43c..754e2f0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ + * FIXES https://bugs.torproject.org/19774 + Add a favicon to BridgeDB's web UI. + Changes in version 0.10.1 - 2020-05-27 * FIXES https://bugs.torproject.org/33945 diff --git a/bridgedb/distributors/https/templates/assets/images/favicon.ico b/bridgedb/distributors/https/templates/assets/images/favicon.ico new file mode 100644 index 0000000..2f24bf9 Binary files /dev/null and b/bridgedb/distributors/https/templates/assets/images/favicon.ico differ diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html index 2f502a9..1f16ca0 100644 --- a/bridgedb/distributors/https/templates/base.html +++ b/bridgedb/distributors/https/templates/base.html @@ -13,6 +13,7 @@ <meta name="description" content="Tor Bridges"> <meta name="author" content="The Tor Project"> + <link rel="icon" type="image/x-icon" href="/assets/images/favicon.ico"> <link rel="stylesheet" href="/assets/css/bootstrap.min.css"> <link rel="stylesheet" href="/assets/css/font-awesome.min.css"> <link rel="stylesheet" href="/assets/css/main.css"> diff --git a/setup.py b/setup.py index 18c391b..74b6254 100644 --- a/setup.py +++ b/setup.py @@ -175,7 +175,8 @@ def get_template_files(): 'assets/font/*.svg', 'assets/font/*.eot', 'assets/js/*.js', - 'assets/images/*.svg'] + 'assets/images/*.svg', + 'assets/images/*.ico'] template_files = [] for include_pattern in include_patterns:

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 04 Jun '20

04 Jun '20

commit 6658f170d406d4fb58b875e04ab99c28eda27c06 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 4 17:20:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-PT.po | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 41ec0e52c0..330d1b64cd 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -639,12 +639,12 @@ msgstr "<img class=\"col-md-6\" src=\"../../static/images/proxy_question.png\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Tor Browser will take you through a series of configuration options." -msgstr "" +msgstr "O Tor Browser vai guiá-lo por uma série de opções de configurações." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" -msgstr "" +msgstr "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -652,11 +652,13 @@ msgid "" "The first checkbox asks if access to the Tor network is blocked or censored " "on your connection." msgstr "" +"A primeira caixa pergunta se o acesso à rede Tor é bloqueado ou censurado na" +" sua conexão." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If you do not believe this is the case, leave this unchecked." -msgstr "" +msgstr "Se não acredita ser o caso, deixe-a vazia." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -665,6 +667,8 @@ msgid "" "connect to the Tor network and no other solutions have worked, check the " "checkbox." msgstr "" +"Se sabe que a sua conexão é censurada, ou tentou e falhou conectar-se à rede" +" Tor e nenhuma outra solução funcionou, clique na caixa." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -672,6 +676,8 @@ msgid "" "This will display the [Circumvention](../circumvention) section to configure" " a pluggable transport." msgstr "" +"Isto irá mostrar a secção de [Evasão](../circumvention) para configurar um " +"transporte de ligação." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -686,16 +692,20 @@ msgid "" "checkbox because the same settings will be used for other browsers on your " "system." msgstr "" +"A segunda caixa pregunta se a sua conexão usa um proxy. Na maioria dos " +"casos, isto não é necessário. Você irá por norma saber se precisa de clicar " +"nesta caixa porque as mesmas definições são usadas nos outros browsers do " +"seu sistema. " #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If possible, ask your network administrator for guidance." -msgstr "" +msgstr "Se possível, peça ao seu administrador de rede ajuda." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If your connection does not use a proxy, click “Connect”." -msgstr "" +msgstr "Se a sua conexão não usar um proxy, clique em \"Conectar\"." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) @@ -797,6 +807,9 @@ msgid "" "of using Tor. meek-azure makes it look like you are using a Microsoft web " "site." msgstr "" +"Os transportes \"meek\" fazem com que pareça que está a navegar por um " +"grande ''site'' da Web em vez de utilizar o Tor. meek-azure faz com que " +"pareça que está a utilizar um ''site'' da Web da Microsoft." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -838,6 +851,8 @@ msgid "" "To use a pluggable transport, click \"Configure\" when starting Tor Browser " "for the first time." msgstr "" +"Para usar um transporte de ligação, clique em 'Configurar' ao iniciar o Tor " +"Browser pela primeira vez." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -845,12 +860,16 @@ msgid "" "After checking the checkbox \"Tor is censored in my country,\" choose the " "\"Select a built-in bridge\" option." msgstr "" +"Após selecionar a caixa \"O Tor é censurado no meu país\", escolha a opção " +"\"Selecionar uma ponte integrada\"" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "" "From the dropdown, select whichever pluggable transport you'd like to use." msgstr "" +"No menu deslizante, selecione o transporte de ligação que gostaria de " +"utilizar." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -858,6 +877,8 @@ msgid "" "Once you've selected the pluggable transport, click \"Connect\" to save your" " settings." msgstr "" +"Após selecionar o transportes de ligação que quer, clique em 'Conectar' para" +" gravar as suas configurações." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -867,6 +888,8 @@ msgid "" "Or, if you have Tor Browser running, click on \"Preferences\" in the " "hamburger menu and then on \"Tor\" in the sidebar." msgstr "" +"Ou, se tiver o Tor Browser a funcionar, clique em \"Preferências\" no menu " +"hamburger e daí em \"Tor\" na barra lateral." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -875,6 +898,9 @@ msgid "" "the option \"Select a built-in bridge,\" choose whichever pluggable " "transport you'd like to use from the dropdown." msgstr "" +"Na secção de \"Pontes\", selecione a caixa \"Usar uma ponte\" e através da " +"opção \"Selecionar uma ponte integrada\", escolha o transporte de ligação " +"que quer usar através do menu deslizante." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -882,6 +908,7 @@ msgstr "" #: (content/bridges/contents+en.lrtopic.body) msgid "Your settings will automatically be saved once you close the tab." msgstr "" +"As suas preferências serão automaticamente gravadas quando fecha a janela." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -904,6 +931,8 @@ msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs4, snowflake, or meek-azure." msgstr "" +"Se estiver a tentar contornar uma conexão bloqueada pela primeira vez, deve " +"tentar transportes diferentes: obfs4, snowflake ou meek-azure." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -911,6 +940,8 @@ msgid "" "If you try all of these options, and none of them gets you online, you will " "need to request a bridge or manually enter bridge addresses." msgstr "" +"Se tentar todas essas opções e ainda assim não conseguir conectar-se, será " +"preciso pedir uma ponte ou inserir os endereços das pontes manualmente. " #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -918,6 +949,8 @@ msgid "" "Read the [Bridges](../bridges/) section to learn what bridges are and how to" " obtain them." msgstr "" +"Leia a secção [Pontes](../bridges/) para saber o que são as pontes e como as" +" obter." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) @@ -1020,6 +1053,8 @@ msgid "" "<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " "src=\"../../static/images/request-a-bridge.png\">" msgstr "" +"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " +"src=\"../../static/images/request-a-bridge.png\">" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1027,6 +1062,8 @@ msgid "" "If you're starting Tor Browser for the first time, click \"Configure\" to " "open the Tor Network Settings window." msgstr "" +"Se estiver a iniciar o Tor Browser pela primeira vez, clique em " +"\"Configurar\" para abrir a janela das Definições da Rede Tor." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1035,6 +1072,9 @@ msgid "" "\"Request a bridge from torproject.org\" and click \"Request a Bridge...\" " "for BridgeDB to provide a bridge." msgstr "" +"Após selecionar a caixa \"O Tor é censurado no meu país\", escolha a opção " +"\"Pedir uma ponte do torproject.org\" e clique em \"Pedir uma ponte...\" " +"para que a BridgeDB providencione uma ponte." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1042,6 +1082,8 @@ msgid "" "Complete the CAPTCHA and click \"Submit.\" Click \"Connect\" to save your " "settings." msgstr "" +"Complete o CAPTCHA e clique em \"Submeter\". Clique em \"Conectar\" para " +"gravar as suas preferências." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 04 Jun '20

04 Jun '20

commit e7a212566895ca458ce8e3aace37f018c70cc87e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 4 16:50:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-PT.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 53fe622d61..41ec0e52c0 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -3,8 +3,8 @@ # Emma Peel, 2019 # erinm, 2020 # Rui <xymarior(a)yandex.com>, 2020 -# Hugo9191 <hugoncosta(a)gmail.com>, 2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2020 +# Hugo Costa <hugoncosta(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Manuela Silva <manuelarodsilva(a)gmail.com>, 2020\n" +"Last-Translator: Hugo Costa <hugoncosta(a)gmail.com>, 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -626,6 +626,8 @@ msgid "" "If you know that your connection is censored or uses a proxy, you should " "select this option." msgstr "" +"Se souber que a sua conexão está a ser censurada, ou que esta usa um proxy, " +"é melhor selecionar esta opção. " #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body)

1 0

[tor/master] config: Add interface address debug logging
by nickm＠torproject.org 04 Jun '20

04 Jun '20

commit 1934e399afecea0859b7ea6b205be96d0f73380b Author: c <c(a)chroniko.jp> Date: Wed Jun 3 14:42:53 2020 +0000 config: Add interface address debug logging Add logging for "the local network interface addresses" as requested by ticket #32888. --- src/lib/net/address.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index b8f5f3774..0571f48a3 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1693,12 +1693,20 @@ get_interface_address6,(int severity, sa_family_t family, tor_addr_t *addr)) /* Find the first non-internal address, or the last internal address * Ideally, we want the default route, see #12377 for details */ SMARTLIST_FOREACH_BEGIN(addrs, tor_addr_t *, a) { + char *addr_str; + int is_internal; tor_addr_copy(addr, a); + is_internal = tor_addr_is_internal(a, 0); rv = 0; + addr_str = tor_addr_to_str_dup(addr); + log_debug(LD_NET, "Found %s interface address '%s'", + (is_internal ? "internal" : "external"), addr_str); + tor_free(addr_str); + /* If we found a non-internal address, declare success. Otherwise, * keep looking. */ - if (!tor_addr_is_internal(a, 0)) + if (!is_internal) break; } SMARTLIST_FOREACH_END(a);

1 0

[tor/master] config: Add IPv4 Address config debug logging
by nickm＠torproject.org 04 Jun '20

04 Jun '20

commit 7640a95602020fb6355d5db1a3cd8bb1c5c2acb5 Author: c <c(a)chroniko.jp> Date: Mon Jun 1 13:02:21 2020 +0000 config: Add IPv4 Address config debug logging Per ticket #32888 this should address logging "the Address torrc option", "and whether it is an IP address, or a DNS name"; or the detected "local hostname", "and whether it is an IP address, or a DNS name". Some of these details already seem to be logged, so just add what's missing. --- src/app/config/resolve_addr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index b551615c0..52f4efc99 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -110,6 +110,8 @@ resolve_my_address(int warn_severity, const or_options_t *options, if (address && *address) { strlcpy(hostname, address, sizeof(hostname)); + log_debug(LD_CONFIG, "Trying configured Address '%s' as local hostname", + hostname); } else { /* then we need to guess our address */ explicit_ip = 0; /* it's implicit */ explicit_hostname = 0; /* it's implicit */ @@ -129,6 +131,8 @@ resolve_my_address(int warn_severity, const or_options_t *options, if (tor_inet_aton(hostname, &in) == 0) { /* then we have to resolve it */ + log_debug(LD_CONFIG, "Local hostname '%s' is DNS address. " + "Trying to resolve to IP address.", hostname); explicit_ip = 0; if (tor_lookup_hostname(hostname, &addr)) { /* failed to resolve */ uint32_t interface_ip; /* host order */ @@ -180,6 +184,8 @@ resolve_my_address(int warn_severity, const or_options_t *options, } } } else { + log_debug(LD_CONFIG, "Local hostname '%s' is already IP address, " + "skipping DNS resolution", hostname); addr = ntohl(in.s_addr); /* set addr so that addr_string is not * illformed */ }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1910/head'
by nickm＠torproject.org 04 Jun '20

04 Jun '20

commit 2b98df3c7478b03c82f2d284dad18ba33fe8c41c Merge: 284e9459b 8b568b50a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 4 10:33:36 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1910/head' src/app/config/resolve_addr.c | 6 ++++++ src/lib/net/address.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/master] config: Styling fix + use fmt_addr()
by nickm＠torproject.org 04 Jun '20

04 Jun '20

commit 8b568b50a5054f5e94d7085682e717b4eab58ce5 Author: c <c(a)chroniko.jp> Date: Thu Jun 4 13:15:27 2020 +0000 config: Styling fix + use fmt_addr() Conform to C99 as suggested by nickm on #32888 and use fmt_addr() rather than tor_addr_to_str_dup() --- src/lib/net/address.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 0571f48a3..b09c9115c 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1693,16 +1693,12 @@ get_interface_address6,(int severity, sa_family_t family, tor_addr_t *addr)) /* Find the first non-internal address, or the last internal address * Ideally, we want the default route, see #12377 for details */ SMARTLIST_FOREACH_BEGIN(addrs, tor_addr_t *, a) { - char *addr_str; - int is_internal; tor_addr_copy(addr, a); - is_internal = tor_addr_is_internal(a, 0); + const bool is_internal = tor_addr_is_internal(a, 0); rv = 0; - addr_str = tor_addr_to_str_dup(addr); log_debug(LD_NET, "Found %s interface address '%s'", - (is_internal ? "internal" : "external"), addr_str); - tor_free(addr_str); + (is_internal ? "internal" : "external"), fmt_addr(addr)); /* If we found a non-internal address, declare success. Otherwise, * keep looking. */

1 0