Browse Source

Merge remote-tracking branch 'origin/maint-0.2.4'

Nick Mathewson 10 years ago
parent
commit
6a0dc0e585
2 changed files with 4 additions and 0 deletions
  1. 3 0
      changes/bug11437
  2. 1 0
      src/or/dns.c

+ 3 - 0
changes/bug11437

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Stop leaking memory when we successfully resolve a PTR record.
+      Fixes bug 11437; bugfix on 0.2.4.7-alpha.

+ 1 - 0
src/or/dns.c

@@ -1353,6 +1353,7 @@ inform_pending_connections(cached_resolve_t *resolve)
     }
     resolve->pending_connections = pend->next;
     tor_free(pend);
+    tor_free(hostname);
   }
 }