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

[tor/release-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/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 6177674a5b0bba4deea3842195654c59def08f73 Merge: e26f38702 831d3b794 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:03:16 2017 -0500 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] 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/release-0.2.8] 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.2.9' into maint-0.3.0
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 2d849716df357b570eaf4557638f63a9b2d8a6c1 Merge: 50fbede45 53c3174ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:02:08 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] 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.2.8' into maint-0.2.9
by nickm＠torproject.org 18 Nov '17

18 Nov '17

commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d Merge: 1b9bb2c84 d388f9d87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:01:43 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

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

18 Nov '17

commit 28673a600e09d52f941de80fabd1b4221d2f0f11 Merge: b5873fa77 d388f9d87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:03:16 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

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

18 Nov '17

commit 73585595245ac9551a1982575941e954bb870ad0 Merge: 1d5e693b6 2d849716d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 18 11:02:42 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)

1 0

[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