diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:43:12 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-07 09:43:12 -0800 |
| commit | b34c5c6b8ac0d13d5e2bda188ff038f6ff7eb4f3 (patch) | |
| tree | 71d94274412ce3e0de48d9c17b47093729f86e8a /src/or/config.c | |
| parent | d9b11d05e85503bbea8724a1770e23849c56a17e (diff) | |
| parent | c7b0cd9c2f52ca289515833060ac0b8461da2225 (diff) | |
| download | tor-b34c5c6b8ac0d13d5e2bda188ff038f6ff7eb4f3.tar.gz tor-b34c5c6b8ac0d13d5e2bda188ff038f6ff7eb4f3.zip | |
Merge branch 'maint-0.2.6' into maint-0.2.7
Conflicts:
src/or/config.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index fa860af337..3b35b5a8d7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -875,7 +875,7 @@ static const char *default_authorities[] = { "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "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 " |