summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-08 16:45:46 -0500
committerNick Mathewson <nickm@torproject.org>2012-11-08 16:45:46 -0500
commit9ad4776e6150a29fdfff607721599eb04c6e76d7 (patch)
tree7189ed200ae8f47bf7d3399d0b99243dc93bced3 /src/or/connection.c
parent758428dd32128874cefacc92ef63c1b5bc9a656e (diff)
parent49dd5ef3a3d1775fdc3c0a7d069d3097b3baeeec (diff)
downloadtor-9ad4776e6150a29fdfff607721599eb04c6e76d7.tar.gz
tor-9ad4776e6150a29fdfff607721599eb04c6e76d7.zip
Merge branch 'bug7352_023_rebased' into maint-0.2.3
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 364e4912da..eac9c4f32b 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -561,7 +561,7 @@ _connection_free(connection_t *conn)
}
#endif
- memset(mem, 0xCC, memlen); /* poison memory */
+ memwipe(mem, 0xCC, memlen); /* poison memory */
tor_free(mem);
}