diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-05 19:43:23 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-05 19:43:23 -0500 |
| commit | e8a6a6635b26c327beca4f2a91c7ec2b2ff03cd8 (patch) | |
| tree | a68dabedc8625fdb97863599df76d7705e271f26 /src/or/rendservice.c | |
| parent | 1969d573637ee6f9c539733db8405c72f0e2e4ab (diff) | |
| parent | 5d4fc193f911d669151f102e5597438e8219ea81 (diff) | |
| download | tor-e8a6a6635b26c327beca4f2a91c7ec2b2ff03cd8.tar.gz tor-e8a6a6635b26c327beca4f2a91c7ec2b2ff03cd8.zip | |
Merge branch 'dgoulet_ticket20699_033_01'
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2cdafa6666..15a0017d66 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -847,9 +847,9 @@ rend_config_service(const config_line_t *line_, * after calling this routine, and may assume that correct cleanup has * been done on failure. * - * Return an appropriate rend_service_add_ephemeral_status_t. + * Return an appropriate hs_service_add_ephemeral_status_t. */ -rend_service_add_ephemeral_status_t +hs_service_add_ephemeral_status_t rend_service_add_ephemeral(crypto_pk_t *pk, smartlist_t *ports, int max_streams_per_circuit, @@ -3576,7 +3576,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, "directories to post descriptors to."); control_event_hs_descriptor_upload(service_id, "UNKNOWN", - "UNKNOWN"); + "UNKNOWN", NULL); goto done; } } @@ -3631,7 +3631,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, hs_dir->or_port); control_event_hs_descriptor_upload(service_id, hs_dir->identity_digest, - desc_id_base32); + desc_id_base32, NULL); tor_free(hs_dir_ip); /* Remember successful upload to this router for next time. */ if (!smartlist_contains_digest(successful_uploads, |