aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerparse.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-07 10:06:50 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-07 10:06:50 -0500
commitcb54cd6745eaf15716aa357fc253f43f26c051a6 (patch)
tree8637fbe20d722885eb295aee4f5f0ac86683854f /src/or/routerparse.h
parent49dca8b1beae9c2dade2c3193fa7f77f5c15d869 (diff)
parent7984fc153112baa5c370215f2205025a7648d7b4 (diff)
downloadtor-cb54cd6745eaf15716aa357fc253f43f26c051a6.tar.gz
tor-cb54cd6745eaf15716aa357fc253f43f26c051a6.zip
Merge branch 'bug9286_v3_squashed'
Diffstat (limited to 'src/or/routerparse.h')
-rw-r--r--src/or/routerparse.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/routerparse.h b/src/or/routerparse.h
index 15fd03b810..18a7d2563c 100644
--- a/src/or/routerparse.h
+++ b/src/or/routerparse.h
@@ -73,7 +73,8 @@ int rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out,
char **intro_points_encrypted_out,
size_t *intro_points_encrypted_size_out,
size_t *encoded_size_out,
- const char **next_out, const char *desc);
+ const char **next_out, const char *desc,
+ int as_hsdir);
int rend_decrypt_introduction_points(char **ipos_decrypted,
size_t *ipos_decrypted_size,
const char *descriptor_cookie,