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

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

27 Nov '17

commit 6661c0352faf01460a0c3835ff342e6402796592 Merge: 28673a600 25c90230b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

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

27 Nov '17

commit 703ab95e9fb94700b6349f539c58705040ede9a8 Merge: 735855952 b1c4ab0be Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

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

27 Nov '17

commit 30b3229252709eeca054ee06cc6e366226723e24 Merge: 53c3174ee 25c90230b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.3.1] Add bastet's ipv6 address
by nickm＠torproject.org 27 Nov '17

27 Nov '17

commit 25c90230be25ec7f041501a033dcc932c3f9c83c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Nov 23 07:37:56 2017 +0100 Add bastet's ipv6 address Implements ticket 24394 --- changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bastet_v6 b/changes/bastet_v6 new file mode 100644 index 000000000..ee4e2c809 --- /dev/null +++ b/changes/bastet_v6 @@ -0,0 +1,4 @@ + o Minor features (directory authority): + - Add an IPv6 address for the "bastet" directory authority. + Closes ticket 24394. + diff --git a/src/or/config.c b/src/or/config.c index dd0eaa871..557790a81 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -931,6 +931,7 @@ static const char *default_authorities[] = { "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", "bastet orport=443 " "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " + "ipv6=[2620:13:4000:6000::1000:118]:443 " "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", NULL };

1 0

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

27 Nov '17

commit 7c548437cc774880b314ae2d01d7b8fab009d397 Merge: bedd32e5d 703ab95e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.3.2] Add bastet's ipv6 address
by nickm＠torproject.org 27 Nov '17

27 Nov '17

commit 25c90230be25ec7f041501a033dcc932c3f9c83c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Nov 23 07:37:56 2017 +0100 Add bastet's ipv6 address Implements ticket 24394 --- changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bastet_v6 b/changes/bastet_v6 new file mode 100644 index 000000000..ee4e2c809 --- /dev/null +++ b/changes/bastet_v6 @@ -0,0 +1,4 @@ + o Minor features (directory authority): + - Add an IPv6 address for the "bastet" directory authority. + Closes ticket 24394. + diff --git a/src/or/config.c b/src/or/config.c index dd0eaa871..557790a81 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -931,6 +931,7 @@ static const char *default_authorities[] = { "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", "bastet orport=443 " "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " + "ipv6=[2620:13:4000:6000::1000:118]:443 " "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", NULL };

1 0

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

27 Nov '17

commit 703ab95e9fb94700b6349f539c58705040ede9a8 Merge: 735855952 b1c4ab0be Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

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

27 Nov '17

commit 30b3229252709eeca054ee06cc6e366226723e24 Merge: 53c3174ee 25c90230b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

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

27 Nov '17

commit 703ab95e9fb94700b6349f539c58705040ede9a8 Merge: 735855952 b1c4ab0be Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0

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

27 Nov '17

commit b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0 Merge: 2d849716d 30b322925 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bastet_v6 | 4 ++++ src/or/config.c | 1 + 2 files changed, 5 insertions(+)

1 0