diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-05 12:20:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-05 12:20:42 -0400 |
| commit | 9d3de77d4d76bbec8dfe8c53b0586171ab4b8ec1 (patch) | |
| tree | 847619f52df7580da44ddc95566fadae69db20ea | |
| parent | f25f7b759c0c3aa2ba333fcf2dd2ad89c5187eef (diff) | |
| parent | 7ae34e722aeccb199938d1c2faa243d23891a74c (diff) | |
| download | tor-9d3de77d4d76bbec8dfe8c53b0586171ab4b8ec1.tar.gz tor-9d3de77d4d76bbec8dfe8c53b0586171ab4b8ec1.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 60d3d7feb5..3c7e6e469b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -864,8 +864,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", |