diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:43:24 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:43:24 -0800 |
| commit | 55232e32c73b114dbe8de643ff0f352e252457ac (patch) | |
| tree | 33085100ab9538da755342ff7a54d112e1325a83 | |
| parent | b5ce3329581b29c61e81f69a5768d7ec0d4e30bf (diff) | |
| parent | b34c5c6b8ac0d13d5e2bda188ff038f6ff7eb4f3 (diff) | |
| download | tor-55232e32c73b114dbe8de643ff0f352e252457ac.tar.gz tor-55232e32c73b114dbe8de643ff0f352e252457ac.zip | |
Merge branch 'maint-0.2.7'
| -rw-r--r-- | changes/bug17906 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug17906 b/changes/bug17906 new file mode 100644 index 0000000000..fff76d1c59 --- /dev/null +++ b/changes/bug17906 @@ -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". diff --git a/src/or/config.c b/src/or/config.c index ff25a79a0b..c1db844bc3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -917,7 +917,7 @@ static const char *default_authorities[] = { "ipv6=[2001:638:a000:4140::ffff:189]:443 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", "urras orport=80 " "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " |