March 2018 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Mar '18

27 Mar '18

commit 6265142079da9420fa4b282c29a0bf4dc05de205 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 00:15:06 2018 +0000 Update translations for bridgedb --- ru/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index b74aed1b2..efcdb381b 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -27,8 +27,8 @@ 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: 2018-02-20 18:46+0000\n" -"Last-Translator: Katrin Kutepova <blackkatelv(a)gmail.com>\n" +"PO-Revision-Date: 2018-03-27 00:07+0000\n" +"Last-Translator: Rory Byrne <info(a)secfirst.org>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 841ed9dbb982d5b0ffb9a5b17b1e4bf2e02f95f2 Merge: ca2d9cbb9 236c92a0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 19:47:44 2018 -0400 Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3 changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.3] chan: Use channel_is_client() in channel_do_open_actions()
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 236c92a0a78285a73b53c6d0f5edba7982407e9b Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Mar 23 10:11:37 2018 -0400 chan: Use channel_is_client() in channel_do_open_actions() Make sure we actually only report client channel to the geoip cache instead of looking if it is a known relay. Looking if it is a known relay can be unreliable because they come and go from the consensus. Fixes #24904 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug24904 b/changes/bug24904 new file mode 100644 index 000000000..648d9a583 --- /dev/null +++ b/changes/bug24904 @@ -0,0 +1,4 @@ + o Minor bugfix (channel, client): + - Better identify client connection when reporting to the geoip client + cache. Fixes bug 24904; bugfix on 0.3.1.7. + diff --git a/src/or/channel.c b/src/or/channel.c index ff1cfde2a..a4740dd75 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1849,8 +1849,8 @@ channel_do_open_actions(channel_t *chan) circuit_build_times_network_is_live(get_circuit_build_times_mutable()); router_set_status(chan->identity_digest, 1); } else { - /* only report it to the geoip module if it's not a known router */ - if (!connection_or_digest_is_known_relay(chan->identity_digest)) { + /* only report it to the geoip module if it's a client */ + if (channel_is_client(chan)) { if (channel_get_addr_if_possible(chan, &remote_addr)) { char *transport_name = NULL; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 841ed9dbb982d5b0ffb9a5b17b1e4bf2e02f95f2 Merge: ca2d9cbb9 236c92a0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 19:47:44 2018 -0400 Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3 changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] chan: Use channel_is_client() in channel_do_open_actions()
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 236c92a0a78285a73b53c6d0f5edba7982407e9b Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Mar 23 10:11:37 2018 -0400 chan: Use channel_is_client() in channel_do_open_actions() Make sure we actually only report client channel to the geoip cache instead of looking if it is a known relay. Looking if it is a known relay can be unreliable because they come and go from the consensus. Fixes #24904 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug24904 b/changes/bug24904 new file mode 100644 index 000000000..648d9a583 --- /dev/null +++ b/changes/bug24904 @@ -0,0 +1,4 @@ + o Minor bugfix (channel, client): + - Better identify client connection when reporting to the geoip client + cache. Fixes bug 24904; bugfix on 0.3.1.7. + diff --git a/src/or/channel.c b/src/or/channel.c index ff1cfde2a..a4740dd75 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1849,8 +1849,8 @@ channel_do_open_actions(channel_t *chan) circuit_build_times_network_is_live(get_circuit_build_times_mutable()); router_set_status(chan->identity_digest, 1); } else { - /* only report it to the geoip module if it's not a known router */ - if (!connection_or_digest_is_known_relay(chan->identity_digest)) { + /* only report it to the geoip module if it's a client */ + if (channel_is_client(chan)) { if (channel_get_addr_if_possible(chan, &remote_addr)) { char *transport_name = NULL; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);

1 0

[tor/release-0.3.3] chan: Use channel_is_client() in channel_do_open_actions()
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 236c92a0a78285a73b53c6d0f5edba7982407e9b Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Mar 23 10:11:37 2018 -0400 chan: Use channel_is_client() in channel_do_open_actions() Make sure we actually only report client channel to the geoip cache instead of looking if it is a known relay. Looking if it is a known relay can be unreliable because they come and go from the consensus. Fixes #24904 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug24904 b/changes/bug24904 new file mode 100644 index 000000000..648d9a583 --- /dev/null +++ b/changes/bug24904 @@ -0,0 +1,4 @@ + o Minor bugfix (channel, client): + - Better identify client connection when reporting to the geoip client + cache. Fixes bug 24904; bugfix on 0.3.1.7. + diff --git a/src/or/channel.c b/src/or/channel.c index ff1cfde2a..a4740dd75 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1849,8 +1849,8 @@ channel_do_open_actions(channel_t *chan) circuit_build_times_network_is_live(get_circuit_build_times_mutable()); router_set_status(chan->identity_digest, 1); } else { - /* only report it to the geoip module if it's not a known router */ - if (!connection_or_digest_is_known_relay(chan->identity_digest)) { + /* only report it to the geoip module if it's a client */ + if (channel_is_client(chan)) { if (channel_get_addr_if_possible(chan, &remote_addr)) { char *transport_name = NULL; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 841ed9dbb982d5b0ffb9a5b17b1e4bf2e02f95f2 Merge: ca2d9cbb9 236c92a0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 19:47:44 2018 -0400 Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3 changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit d96dc2060a0470a4607db6f2991ea7c2c3508e23 Merge: 5278d72f9 841ed9dbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 19:47:48 2018 -0400 Merge branch 'maint-0.3.3' changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 1f3e0f157cbd7c71f8f8505e3f0ee3cc07ead629 Merge: 08cc2cc69 841ed9dbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 19:47:48 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24904 | 4 ++++ src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 26 Mar '18

26 Mar '18

commit ff22a0ce8da75ee9e80296fff42d6bae373440e4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 26 23:15:47 2018 +0000 Update translations for liveusb-creator_completed --- nb/nb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 5277c6653..d45c69d9b 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -4,7 +4,7 @@ # # Translators: # Allan Nordhøy <epost(a)anotheragency.no>, 2014 -# Allan Nordhøy <epost(a)anotheragency.no>, 2015-2017 +# Allan Nordhøy <epost(a)anotheragency.no>, 2015-2018 # John Henningsen <henningsen.teknikk(a)gmail.com>, 2015 # lateralus, 2013-2014 # trash <nicolaip(a)outlook.com>, 2013 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2017-11-11 03:09+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-03-26 22:46+0000\n" +"Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -385,7 +385,7 @@ msgstr "Klarer ikke å laste enhet" #: ../tails_installer/gui.py:705 ../tails_installer/gui.py:735 msgid "Confirm the target USB stick" -msgstr "Bekreft hvilet USB-minne du vil installere på" +msgstr "Bekreft hvilket USB-minne du vil installere på" #: ../tails_installer/gui.py:706 #, python-format

1 0