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

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 65a6103afc39890f41f6f5e7ba7e4ef570af1622 Merge: d45bf0c65 735855952 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:02:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "Ours" merge to avoid taking ticket18329_minimal_025

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit d388f9d879ebedf05c7f399f8b8eb3df9c43d3af Merge: 800797e7f 831d3b794 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:01:33 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --cc src/or/router.c index 01316c1bc,90b2431a2..bc7a2fcfc --- a/src/or/router.c +++ b/src/or/router.c @@@ -2748,6 -2385,16 +2748,15 @@@ router_dump_router_to_string(routerinfo smartlist_add_asprintf(chunks, "contact %s\n", ci); } + if (options->BridgeRelay) { + const char *bd; + if (options->PublishServerDescriptor_ & BRIDGE_DIRINFO) + bd = "any"; + else + bd = "none"; + smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd); + } + -#ifdef CURVE25519_ENABLED if (router->onion_curve25519_pkey) { char kbuf[128]; base64_encode(kbuf, sizeof(kbuf),

1 0

[tor/release-0.2.5] Minimal implementation of bridge-distribution-request
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 9f2efd02a1281998d11049162c11af6bfc5851c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:44:51 2017 -0500 Minimal implementation of bridge-distribution-request Just advertise the line when we're a bridge, using "any" if we're published or "none" if we aren't. This is done in lieu of a full backport of #18329. --- changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/bug18329-minimal b/changes/bug18329-minimal new file mode 100644 index 000000000..804c4e8dd --- /dev/null +++ b/changes/bug18329-minimal @@ -0,0 +1,6 @@ + o Minor features (bridge): + - Bridges now include notice in their descriptors that they are bridges, + and notice of their distribution status, based on their publication + settings. Implements ticket 18329. For more fine-grained control of + how a bridge is distributed, upgrade to 0.3.2.x or later. + diff --git a/src/or/router.c b/src/or/router.c index 2cdbb0c8b..90b2431a2 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2385,6 +2385,15 @@ router_dump_router_to_string(routerinfo_t *router, smartlist_add_asprintf(chunks, "contact %s\n", ci); } + if (options->BridgeRelay) { + const char *bd; + if (options->PublishServerDescriptor_ & BRIDGE_DIRINFO) + bd = "any"; + else + bd = "none"; + smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd); + } + #ifdef CURVE25519_ENABLED if (router->onion_curve25519_pkey) { char kbuf[128];

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit fd40be15ef9d067486f98f2ffaf947ec6add2cf5 Merge: 43e0472fc 65a6103af Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:03:16 2017 -0500 Merge branch 'maint-0.3.2'

1 0

[tor/release-0.2.8] Merge branch 'ticket18329_minimal_025' into maint-0.2.5
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 831d3b794da65b03be7e4fd107ba209d7211de76 Merge: 6f8c32b7d 9f2efd02a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:00:45 2017 -0500 Merge branch 'ticket18329_minimal_025' into maint-0.2.5 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 65a6103afc39890f41f6f5e7ba7e4ef570af1622 Merge: d45bf0c65 735855952 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:02:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "Ours" merge to avoid taking ticket18329_minimal_025

1 0

[tor/maint-0.2.5] Minimal implementation of bridge-distribution-request
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 9f2efd02a1281998d11049162c11af6bfc5851c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:44:51 2017 -0500 Minimal implementation of bridge-distribution-request Just advertise the line when we're a bridge, using "any" if we're published or "none" if we aren't. This is done in lieu of a full backport of #18329. --- changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/bug18329-minimal b/changes/bug18329-minimal new file mode 100644 index 000000000..804c4e8dd --- /dev/null +++ b/changes/bug18329-minimal @@ -0,0 +1,6 @@ + o Minor features (bridge): + - Bridges now include notice in their descriptors that they are bridges, + and notice of their distribution status, based on their publication + settings. Implements ticket 18329. For more fine-grained control of + how a bridge is distributed, upgrade to 0.3.2.x or later. + diff --git a/src/or/router.c b/src/or/router.c index 2cdbb0c8b..90b2431a2 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2385,6 +2385,15 @@ router_dump_router_to_string(routerinfo_t *router, smartlist_add_asprintf(chunks, "contact %s\n", ci); } + if (options->BridgeRelay) { + const char *bd; + if (options->PublishServerDescriptor_ & BRIDGE_DIRINFO) + bd = "any"; + else + bd = "none"; + smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd); + } + #ifdef CURVE25519_ENABLED if (router->onion_curve25519_pkey) { char kbuf[128];

1 0

[tor/maint-0.2.5] Merge branch 'ticket18329_minimal_025' into maint-0.2.5
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 831d3b794da65b03be7e4fd107ba209d7211de76 Merge: 6f8c32b7d 9f2efd02a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:00:45 2017 -0500 Merge branch 'ticket18329_minimal_025' into maint-0.2.5 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] Move an assertion to make scan-build happy again.
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 43e0472fcfc3723e781d20ae3fb23e9f28e2ef50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 10:51:23 2017 -0500 Move an assertion to make scan-build happy again. --- src/or/dirvote.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index ce82a5ef4..6b806879a 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -795,6 +795,9 @@ dirvote_compute_params(smartlist_t *votes, int method, int total_authorities) output = smartlist_new(); SMARTLIST_FOREACH_BEGIN(param_list, const char *, param) { + /* resolve spurious clang shallow analysis null pointer errors */ + tor_assert(param); + const char *next_param; int ok=0; eq = strchr(param, '='); @@ -807,8 +810,7 @@ dirvote_compute_params(smartlist_t *votes, int method, int total_authorities) next_param = NULL; else next_param = smartlist_get(param_list, param_sl_idx+1); - /* resolve spurious clang shallow analysis null pointer errors */ - tor_assert(param); + if (!next_param || strncmp(next_param, param, cur_param_len)) { /* We've reached the end of a series. */ /* Make sure enough authorities voted on this param, unless the

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 18 Nov '17

18 Nov '17

commit 8226623f3b9f0d676849c7f9ff67b7f4d7ebfcca Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 18 15:50:34 2017 +0000 Update translations for exoneratorproperties --- bn_BD/exonerator.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bn_BD/exonerator.properties b/bn_BD/exonerator.properties index 124be6c0d..cede7dde2 100644 --- a/bn_BD/exonerator.properties +++ b/bn_BD/exonerator.properties @@ -1,7 +1,7 @@ form.explanation=Enter an IP address and date to find out whether that address was used as a Tor relay: form.ip.label=IP address form.timestamp.label=Date -form.search.label=Search +form.search.label=খুজুন summary.heading=Summary summary.serverproblem.dbnoconnect.title=Server problem summary.serverproblem.dbnoconnect.body.text=Unable to connect to the database. Please try again later. If this problem persists, please %s! @@ -40,7 +40,7 @@ technicaldetails.exit.unknown=অজানা technicaldetails.exit.yes=হা technicaldetails.exit.no=না permanentlink.heading=Permanent link -footer.abouttor.heading=About Tor +footer.abouttor.heading=Tor সম্পর্কে footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by %s.  Therefore, if you see traffic from a Tor relay, this traffic usually originates from someone using Tor, rather than from the relay operator.  The Tor Project and Tor relay operators have no records of the traffic that passes over the network and therefore cannot provide any information about its origin.  Be sure to %s, and don't hesitate to %s for more information. footer.abouttor.body.link1=encrypting packets and sending them through a series of hops before they reach their destination footer.abouttor.body.link2=learn more about Tor

1 0