summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-23 09:06:34 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-23 09:06:34 -0400
commitd99c6b725263dbc140373ad9278f28d376499a1b (patch)
tree3595c1db7f0f3499e91a6df4cc2272665af487db /src/or/config.c
parent97046436b20dbba1258267e0a7bd0c5b02e125d4 (diff)
parent009141c6a8b282b22bc9ee2fc0bf9fd9eb8ce867 (diff)
downloadtor-d99c6b725263dbc140373ad9278f28d376499a1b.tar.gz
tor-d99c6b725263dbc140373ad9278f28d376499a1b.zip
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 096583bc80..6270b795f8 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1062,6 +1062,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
};