diff --git a/ChangeLog b/ChangeLog
index 3e83610de6..b4cb45584e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -255,6 +255,10 @@ Changes in version 0.2.8.2-alpha - 2016-03-28
     - Correctly duplicate addresses in get_interface_address6_list.
       Fixes bug 18454; bugfix on 110765f5 in tor-0.2.8.1-alpha. Reported
       by "toralf", patch by "cypherpunks".
+    - Fix a memory leak in tor-gencert. Fixes part of bug 18672; bugfix on
+      0.2.0.1-alpha.
+    - Fix a memory leak in "tor --list-figngerprint". Fixes part of bug
+      18672; bugfix on 0.2.0.1-alpha.
 
   o Minor bugfixes (private directory):
     - Prevent a race condition when creating private directories. Fixes
diff --git a/src/or/main.c b/src/or/main.c
index 26e52d241d..a2cf5b1101 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3245,6 +3245,7 @@ do_list_fingerprint(void)
   char buf[FINGERPRINT_LEN+1];
   crypto_pk_t *k;
   const char *nickname = get_options()->Nickname;
+  sandbox_disable_getaddrinfo_cache();
   if (!server_mode(get_options())) {
     log_err(LD_GENERAL,
             "Clients don't have long-term identity keys. Exiting.");