diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:48:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:48:04 -0500 |
| commit | 81deddb08c6b8bf644f663dcdc31720e365f68dc (patch) | |
| tree | 9e67efdfb4451dcc169727dc0e64f8f5bfca95b8 /src/or/connection_edge.c | |
| parent | 9f3f5372b880b3372fd7b9fc98bd3d78f969390a (diff) | |
| parent | 9ad4776e6150a29fdfff607721599eb04c6e76d7 (diff) | |
| download | tor-81deddb08c6b8bf644f663dcdc31720e365f68dc.tar.gz tor-81deddb08c6b8bf644f663dcdc31720e365f68dc.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Conflicts:
src/common/crypto.c
src/or/rendservice.c
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 4d528a810e..162de2e009 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3716,11 +3716,11 @@ circuit_clear_isolation(origin_circuit_t *circ) circ->session_group = -1; circ->nym_epoch = 0; if (circ->socks_username) { - memset(circ->socks_username, 0x11, circ->socks_username_len); + memwipe(circ->socks_username, 0x11, circ->socks_username_len); tor_free(circ->socks_username); } if (circ->socks_password) { - memset(circ->socks_password, 0x05, circ->socks_password_len); + memwipe(circ->socks_password, 0x05, circ->socks_password_len); tor_free(circ->socks_password); } circ->socks_username_len = circ->socks_password_len = 0; |