aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-07 15:20:50 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-07 15:20:50 -0500
commitba7d93db16fd53c951b6a159adeb7b4094817c11 (patch)
treeabe4ab2c73650426d9c8cbb4ffb7bf4efcd1b3b9 /src/or/control.c
parent0061d428900946ce8bf5c8bfb4c2b3b5faa4f691 (diff)
parentd3aabf4db176a44d19046b58b99f2edb8c5f49bb (diff)
downloadtor-ba7d93db16fd53c951b6a159adeb7b4094817c11.tar.gz
tor-ba7d93db16fd53c951b6a159adeb7b4094817c11.zip
Merge remote-tracking branch 'public/bug7816_023'
Conflicts: src/common/util.c
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 9ab0dafb7b..03e5d79c8e 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3143,6 +3143,8 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len,
"SERVERNONCE=%s\r\n",
server_hash_encoded,
server_nonce_encoded);
+
+ tor_free(client_nonce);
return 0;
}