nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.6' into maint-0.2.7

Browse Source 
Conflicts:
	src/or/config.c
This commit is contained in:
Nick Mathewson 2016-01-07 09:43:12 -08:00
commit b34c5c6b8a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug17906 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (authorities):
- Update the V3 identity key for dannenberg, it was changed on
18 November 2015.
Closes task #17906. Patch by "teor".

2
src/or/config.c
View File

@ -875,7 +875,7 @@ static const char *default_authorities[] = {
"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
"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=585769C78764D58426B8B52B6651A5A71137189A " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
"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",
"urras orport=80 " "urras orport=80 "
"v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "