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 | 1db5081ba1e9201673dac296957a6d8b0a694855 (patch) | |
| tree | fa246f2697ca7f14668a16fd62cd6c5215a55cbb | |
| parent | c958fda6e29265b12b987ee8445873c25629ae71 (diff) | |
| parent | 8cc147aa834b076233c5448992e145b908123908 (diff) | |
| download | tor-1db5081ba1e9201673dac296957a6d8b0a694855.tar.gz tor-1db5081ba1e9201673dac296957a6d8b0a694855.zip | |
Merge branch 'maint-0.2.8' into maint-0.2.9
| -rw-r--r-- | changes/ticket23910 | 3 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket23910 b/changes/ticket23910 new file mode 100644 index 0000000000..eb38fcf32f --- /dev/null +++ b/changes/ticket23910 @@ -0,0 +1,3 @@ + o Directory authority changes: + - Add bastet as a ninth directory authority to the default list. Closes + ticket 23910. diff --git a/src/or/config.c b/src/or/config.c index e720cf2362..08cc5cdf57 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -975,6 +975,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 }; |