summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
Diffstat (limited to 'src/or')
-rw-r--r--src/or/config.c3
-rw-r--r--src/or/dirserv.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 4982ee0115..954ada6379 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -760,6 +760,9 @@ add_default_trusted_dir_authorities(authority_type_t type)
"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
"urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
"208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
+ "maatuska orport=80 no-v2 "
+ "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
+ "213.115.239.118:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
NULL
};
for (i=0; dirservers[i]; i++) {
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 8b215011f3..24b4d5483b 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1597,6 +1597,8 @@ dirserv_get_runningrouters(void)
cached_dir_t *
dirserv_get_consensus(const char *flavor_name)
{
+ if (!cached_consensuses)
+ return NULL;
return strmap_get(cached_consensuses, flavor_name);
}