diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-12-16 17:24:11 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-12-16 17:24:11 -0500 |
| commit | c63c937465f91b60f07e70942e2cb5af1b90dce4 (patch) | |
| tree | 1b44da39cbe47b5176829100ed8ff038348681fc /src/or/connection_edge.h | |
| parent | 591f65dde68c7847e4282c4cba5a11868fe13158 (diff) | |
| parent | b5e293afe6b3c98b50c23cc443969b5f840dca32 (diff) | |
| download | tor-c63c937465f91b60f07e70942e2cb5af1b90dce4.tar.gz tor-c63c937465f91b60f07e70942e2cb5af1b90dce4.zip | |
Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2
Diffstat (limited to 'src/or/connection_edge.h')
| -rw-r--r-- | src/or/connection_edge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 762af5172e..cca82022c3 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -38,7 +38,7 @@ void connection_ap_handshake_socks_reply(edge_connection_t *conn, char *reply, void connection_ap_handshake_socks_resolved(edge_connection_t *conn, int answer_type, size_t answer_len, - const char *answer, + const uint8_t *answer, int ttl, time_t expires); |