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

Conflicts:
	src/common/crypto.c
	src/or/rendservice.c

1 files changed, 2 insertions, 1 deletions

diff --git a/src/common/mempool.c b/src/common/mempool.c
index 0d2580dca..78d4da6f7 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "torint.h"
+#include "crypto.h"
 #define MEMPOOL_PRIVATE
 #include "mempool.h"
 
@@ -509,7 +510,7 @@ mp_pool_destroy(mp_pool_t *pool)
   destroy_chunks(pool->empty_chunks);
   destroy_chunks(pool->used_chunks);
   destroy_chunks(pool->full_chunks);
-  memset(pool, 0xe0, sizeof(mp_pool_t));
+  memwipe(pool, 0xe0, sizeof(mp_pool_t));
   FREE(pool);
 }