diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-15 22:47:28 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-15 22:48:23 -0500 |
| commit | b5e293afe6b3c98b50c23cc443969b5f840dca32 (patch) | |
| tree | 803a93a09d717782452108ab21ab2cac6a732f26 /src/or/rendcommon.h | |
| parent | ddfb398494ddf9d514a3ff16ade69c619c659ce7 (diff) | |
| parent | b0def605a52b3acce1cb212f270b184d72f237f5 (diff) | |
| download | tor-b5e293afe6b3c98b50c23cc443969b5f840dca32.tar.gz tor-b5e293afe6b3c98b50c23cc443969b5f840dca32.zip | |
Merge remote branch fix_security_bug_021 into fix_security_bug_022
Conflicts:
src/common/memarea.c
src/or/or.h
src/or/rendclient.c
Diffstat (limited to 'src/or/rendcommon.h')
| -rw-r--r-- | src/or/rendcommon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index 00705022a2..d3313faf5a 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -22,7 +22,8 @@ rend_data_free(rend_data_t *data) int rend_cmp_service_ids(const char *one, const char *two); void rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint, - int command, size_t length, const char *payload); + int command, size_t length, + const uint8_t *payload); void rend_service_descriptor_free(rend_service_descriptor_t *desc); rend_service_descriptor_t *rend_parse_service_descriptor(const char *str, |