nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into maint-0.3.3

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-12 09:44:17 -04:00
commit eaa359650c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket26343 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (directory authority):
- Add an IPv6 address for the "dannenberg" directory
authority. Closes ticket 26343.

1
src/or/auth_dirs.inc
View File

@ -16,6 +16,7 @@
"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
"dannenberg orport=443 " "dannenberg orport=443 "
"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
"ipv6=[2001:678:558:1000::244]:443 "
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
"maatuska orport=80 " "maatuska orport=80 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "