diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-24 15:12:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-24 15:12:16 -0400 |
| commit | 91c6bc160b1d2be60e5756f13d28ba469049351c (patch) | |
| tree | 9bd25229bde6e1f7960665c130fa650d3e167a4b /src/or/rendcommon.h | |
| parent | b5c5086aba2fa24649fcbda7db80ef599d56e3c6 (diff) | |
| parent | dc0264f6593116da413dc5ca6c424dcff36fbbd2 (diff) | |
| download | tor-91c6bc160b1d2be60e5756f13d28ba469049351c.tar.gz tor-91c6bc160b1d2be60e5756f13d28ba469049351c.zip | |
Merge remote-tracking branch 'dgoulet/ticket17242_032_03-squashed'
Diffstat (limited to 'src/or/rendcommon.h')
| -rw-r--r-- | src/or/rendcommon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index 292f9277e8..af8dd60099 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -30,7 +30,7 @@ void rend_encoded_v2_service_descriptor_free( rend_encoded_v2_service_descriptor_t *desc); void rend_intro_point_free(rend_intro_point_t *intro); -int rend_valid_service_id(const char *query); +int rend_valid_v2_service_id(const char *query); int rend_valid_descriptor_id(const char *query); int rend_valid_client_name(const char *client_name); int rend_encode_v2_descriptors(smartlist_t *descs_out, @@ -60,7 +60,7 @@ int rend_auth_decode_cookie(const char *cookie_in, int rend_allow_non_anonymous_connection(const or_options_t* options); int rend_non_anonymous_mode_enabled(const or_options_t *options); -void assert_circ_anonymity_ok(origin_circuit_t *circ, +void assert_circ_anonymity_ok(const origin_circuit_t *circ, const or_options_t *options); #ifdef RENDCOMMON_PRIVATE |