diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-23 09:03:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-23 09:03:58 -0400 |
| commit | 5e1bad325965c4f91433dfbe46f4d3c268327d4e (patch) | |
| tree | 67eac5e5b6fc60678bf1e08ad8841b3543c4561f | |
| parent | 533ae56fcf57e8120549f6026677923fc66e9e26 (diff) | |
| parent | 15a699462dbf32df78cd187e013063450b989c15 (diff) | |
| download | tor-5e1bad325965c4f91433dfbe46f4d3c268327d4e.tar.gz tor-5e1bad325965c4f91433dfbe46f4d3c268327d4e.zip | |
Merge branch 'maint-0.2.5' into release-0.2.5
| -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 97dffe5050..bd168bef17 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -873,6 +873,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "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 }; for (i=0; authorities[i]; i++) { |