2 files changed, 6 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index ba669fe8c..8f1b93d3e 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -871,6 +871,9 @@ addressmap_get_mappings(smartlist_t *sl, time_t min_expires, time_t max_expires)
    void *_val;
    addressmap_entry_t *val;
 
+   if (!addressmap)
+     addressmap_init();
+
    for (iter = strmap_iter_init(addressmap); !strmap_iter_done(iter); ) {
      strmap_iter_get(iter, &key, &_val);
      val = _val;
diff --git a/src/or/test.c b/src/or/test.c
index d6252061b..604c68694 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1525,11 +1525,13 @@ main(int c, char**v)
 {
   or_options_t *options = options_new();
   network_init();
+  setup_directory();
   options_init(options);
+  options->DataDirectory = tor_strdup(temp_dir);
   set_options(options);
 
   crypto_seed_rng();
-  setup_directory();
+
   rep_hist_init();
   atexit(remove_directory);