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 | 2c93be80d9ad0712b5716c85e32f7a5184f3b1d2 (patch) | |
| tree | 856cf5eafc4973e717f758c6e247b7278381e1fe /src | |
| parent | 42e12a3537fef04ab77defd6cb5581add439de43 (diff) | |
| parent | 8e52c46581ca8279c0f132a822e06f10e5f4676d (diff) | |
| download | tor-2c93be80d9ad0712b5716c85e32f7a5184f3b1d2.tar.gz tor-2c93be80d9ad0712b5716c85e32f7a5184f3b1d2.zip | |
Merge branch 'maint-0.2.8' into maint-0.2.9
Diffstat (limited to 'src')
| -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 3693cdf83c..2e001ee5ab 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -974,7 +974,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 }; |