diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-23 09:06:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-23 09:06:34 -0400 |
| commit | 23e3d57e12bd0ca4bedae2307440e08e22744802 (patch) | |
| tree | ea06bea6f1ef0ff234eaec026677a7731c5e083f /src/or/config.c | |
| parent | df57d1e0c0e3e19dc4963391ad7f80ead3ab4f0d (diff) | |
| parent | c93ecb8189773e06fa3635fff8184024c6c6e0fa (diff) | |
| download | tor-23e3d57e12bd0ca4bedae2307440e08e22744802.tar.gz tor-23e3d57e12bd0ca4bedae2307440e08e22744802.zip | |
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index f84e69e257..c13985543a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1022,6 +1022,9 @@ static const char *default_authorities[] = { "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + "bastet orport=443 " + "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " + "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", NULL }; |