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 | 4bb287aa39d74e99dc319cd0a3fde88419340848 (patch) | |
| tree | 172fd62e92bdd883ad08039f3bdd110c1c679419 /src/or | |
| parent | a7e777ab8ef6063f3811be58e152269ad38b9143 (diff) | |
| parent | 703ab95e9fb94700b6349f539c58705040ede9a8 (diff) | |
| download | tor-4bb287aa39d74e99dc319cd0a3fde88419340848.tar.gz tor-4bb287aa39d74e99dc319cd0a3fde88419340848.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 78db03c68a..a33812a4c7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1079,6 +1079,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 }; |