diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-27 09:09:34 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-27 09:09:34 -0500 |
| commit | 703ab95e9fb94700b6349f539c58705040ede9a8 (patch) | |
| tree | b05ac9634f78f9925a5dc3c29552660718cbddd9 | |
| parent | 73585595245ac9551a1982575941e954bb870ad0 (diff) | |
| parent | b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0 (diff) | |
| download | tor-703ab95e9fb94700b6349f539c58705040ede9a8.tar.gz tor-703ab95e9fb94700b6349f539c58705040ede9a8.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
| -rw-r--r-- | changes/bastet_v6 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bastet_v6 b/changes/bastet_v6 new file mode 100644 index 0000000000..ee4e2c8094 --- /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 429d51f3d1..2f92591b19 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1024,6 +1024,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 }; |