diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-20 08:32:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-20 08:32:55 -0400 |
| commit | 654820ec1ca79f5938db81b6d78c452afa1cd9a6 (patch) | |
| tree | cd6af01c5866b1f9c8fc0d60189292450b45a344 /src/or | |
| parent | 346066a42e2c4a265a3c26b3644310d2919f8528 (diff) | |
| parent | 746410fb24055db0046a6d70986efcc6e3d10281 (diff) | |
| download | tor-654820ec1ca79f5938db81b6d78c452afa1cd9a6.tar.gz tor-654820ec1ca79f5938db81b6d78c452afa1cd9a6.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 67bf3b9671..a98d18355f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1021,7 +1021,6 @@ static const char *default_authorities[] = { "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "ipv6=[2620:13:4000:8000:60:f3ff:fea1:7cff]:443 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; |