- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit e247093e0efba100ec6f3abdfa9d3433d51389f0 Merge: ba87f5b b79d859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:10:58 2016 -0400 Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8 changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/master] Include IPv6 consensus downloads in dirreq stats.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit b79d8590c914c394e3edb3bfab5a39fc649fe071 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 25 20:53:36 2016 +0100 Include IPv6 consensus downloads in dirreq stats. Fixes #18460. --- changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18460 b/changes/bug18460 new file mode 100644 index 0000000..457e5df --- /dev/null +++ b/changes/bug18460 @@ -0,0 +1,4 @@ + o Minor bugfixes (statistics): + - Include consensus downloads via IPv6 in directory-request statistics. + Fixes bug 18480; bugfix on 4741aa4 in 0.2.3.14-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index e4feda4..b269a3f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2956,10 +2956,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } if (1) { - struct in_addr in; tor_addr_t addr; - if (tor_inet_aton((TO_CONN(conn))->address, &in)) { - tor_addr_from_ipv4h(&addr, ntohl(in.s_addr)); + if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) { geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, time(NULL));

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 9e57ffa520bb0e8b9a7dd32e005e6b29a3f8bdfa Merge: 93c311d e247093 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:15:05 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.8] Include IPv6 consensus downloads in dirreq stats.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit b79d8590c914c394e3edb3bfab5a39fc649fe071 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 25 20:53:36 2016 +0100 Include IPv6 consensus downloads in dirreq stats. Fixes #18460. --- changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18460 b/changes/bug18460 new file mode 100644 index 0000000..457e5df --- /dev/null +++ b/changes/bug18460 @@ -0,0 +1,4 @@ + o Minor bugfixes (statistics): + - Include consensus downloads via IPv6 in directory-request statistics. + Fixes bug 18480; bugfix on 4741aa4 in 0.2.3.14-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index e4feda4..b269a3f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2956,10 +2956,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } if (1) { - struct in_addr in; tor_addr_t addr; - if (tor_inet_aton((TO_CONN(conn))->address, &in)) { - tor_addr_from_ipv4h(&addr, ntohl(in.s_addr)); + if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) { geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, time(NULL));

1 0

[tor/release-0.2.8] Fix my dumb unreleased bug in 18673
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit ba87f5bb25cd001ab8560f23a88e60a504c7059a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 20:09:09 2016 -0400 Fix my dumb unreleased bug in 18673 --- src/or/circuitlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 670c5b3..1efb7ef 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -760,7 +760,7 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan) void circuit_clear_testing_cell_stats(circuit_t *circ) { - if (!circ) + if (!circ || !circ->testing_cell_stats) return; SMARTLIST_FOREACH(circ->testing_cell_stats, testing_cell_stats_entry_t *, ent, tor_free(ent));

1 0

[tor/release-0.2.8] Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit e247093e0efba100ec6f3abdfa9d3433d51389f0 Merge: ba87f5b b79d859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:10:58 2016 -0400 Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8 changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.8] Include IPv6 consensus downloads in dirreq stats.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit b79d8590c914c394e3edb3bfab5a39fc649fe071 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 25 20:53:36 2016 +0100 Include IPv6 consensus downloads in dirreq stats. Fixes #18460. --- changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18460 b/changes/bug18460 new file mode 100644 index 0000000..457e5df --- /dev/null +++ b/changes/bug18460 @@ -0,0 +1,4 @@ + o Minor bugfixes (statistics): + - Include consensus downloads via IPv6 in directory-request statistics. + Fixes bug 18480; bugfix on 4741aa4 in 0.2.3.14-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index e4feda4..b269a3f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2956,10 +2956,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } if (1) { - struct in_addr in; tor_addr_t addr; - if (tor_inet_aton((TO_CONN(conn))->address, &in)) { - tor_addr_from_ipv4h(&addr, ntohl(in.s_addr)); + if (tor_addr_parse(&addr, (TO_CONN(conn))->address) >= 0) { geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, time(NULL));

1 0

[tor/maint-0.2.8] Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit e247093e0efba100ec6f3abdfa9d3433d51389f0 Merge: ba87f5b b79d859 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:10:58 2016 -0400 Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8 changes/bug18460 | 4 ++++ src/or/directory.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit fda3587cd675543b743ef30a634564a33bacc616 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 07:16:55 2016 +0000 Update translations for tails-onioncircuits_completed --- nb/onioncircuits.pot | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/nb/onioncircuits.pot b/nb/onioncircuits.pot new file mode 100644 index 0000000..6cea49e --- /dev/null +++ b/nb/onioncircuits.pot @@ -0,0 +1,92 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Espen Krogsrud Brekken <espbre(a)gmail.com>, 2016 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-26 00:31+0100\n" +"PO-Revision-Date: 2016-04-01 06:48+0000\n" +"Last-Translator: Espen Krogsrud Brekken <espbre(a)gmail.com>\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" +"Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../onioncircuits:81 +msgid "" +"Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." +msgstr "Klarer ikke å koble til Tor-daemon. Onion Circuits vil forsøke å koble til på nytt..." + +#: ../onioncircuits:94 +msgid "Onion Circuits" +msgstr "Onion Circuits" + +#: ../onioncircuits:95 +msgid "Display Tor circuits and streams" +msgstr "Vis Tor-kretser og -strømmer" + +#: ../onioncircuits:107 +msgid "OK" +msgstr "OK" + +#: ../onioncircuits:124 +msgid "Path" +msgstr "Rute" + +#: ../onioncircuits:125 +msgid "Status" +msgstr "Status" + +#: ../onioncircuits:141 +msgid "Click on a path to get details" +msgstr "Klikk på en sti for å se detaljer" + +#: ../onioncircuits:215 +msgid "" +"Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." +msgstr "Mistet kontakten med Tor-daemonen. Onion Circuits vil forsøke å koble til på nytt..." + +#: ../onioncircuits:232 +msgid "Connected to the Tor daemon! You can use now Onion Circuits." +msgstr "Koblet til Tor-daemonen! Du kan nå bruke Onion Circuits." + +#: ../onioncircuits:314 +msgid "Building..." +msgstr "Bygger..." + +#: ../onioncircuits:339 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: ../onioncircuits:564 +msgid "Fingerprint:" +msgstr "Fingeravtrykk:" + +#: ../onioncircuits:565 +msgid "Published:" +msgstr "Publisert:" + +#: ../onioncircuits:566 +msgid "IP:" +msgstr "IP:" + +#: ../onioncircuits:566 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:567 +msgid "Bandwidth:" +msgstr "Båndbredde:" + +#: ../onioncircuits:567 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f Mb/s"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit 0a427a447ec3b1716b5aabdd673be04a6df46f19 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 07:16:50 2016 +0000 Update translations for tails-onioncircuits --- nb/onioncircuits.pot | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nb/onioncircuits.pot b/nb/onioncircuits.pot index 3767cb0..6cea49e 100644 --- a/nb/onioncircuits.pot +++ b/nb/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-04-01 06:46+0000\n" +"PO-Revision-Date: 2016-04-01 06:48+0000\n" "Last-Translator: Espen Krogsrud Brekken <espbre(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" #: ../onioncircuits:81 msgid "" "Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "Klarer ikke å koble til Tor-daemon. Onion Circuits vil prøve å koble til på nytt..." +msgstr "Klarer ikke å koble til Tor-daemon. Onion Circuits vil forsøke å koble til på nytt..." #: ../onioncircuits:94 msgid "Onion Circuits" @@ -63,7 +63,7 @@ msgstr "Bygger..." #: ../onioncircuits:339 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #: ../onioncircuits:564 msgid "Fingerprint:" @@ -71,16 +71,16 @@ msgstr "Fingeravtrykk:" #: ../onioncircuits:565 msgid "Published:" -msgstr "" +msgstr "Publisert:" #: ../onioncircuits:566 msgid "IP:" -msgstr "" +msgstr "IP:" #: ../onioncircuits:566 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: ../onioncircuits:567 msgid "Bandwidth:" @@ -89,4 +89,4 @@ msgstr "Båndbredde:" #: ../onioncircuits:567 #, c-format msgid "%.2f Mb/s" -msgstr "" +msgstr "%.2f Mb/s"

1 0