aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-02-24 11:37:41 -0500
committerNick Mathewson <nickm@torproject.org>2017-02-24 11:37:41 -0500
commit02aaa7f9edd333a40d364fd99f3c141dfe85b651 (patch)
tree869639099f507f7f7b0a6fff0cb93ff6ee11fb30 /src
parentd73755e36e83f30e9a961029b6eaba34c3935845 (diff)
parent619771f60bde6b69eeaad4efbd844705ec5bcb83 (diff)
downloadtor-02aaa7f9edd333a40d364fd99f3c141dfe85b651.tar.gz
tor-02aaa7f9edd333a40d364fd99f3c141dfe85b651.zip
Merge branch 'maint-0.3.0'
Diffstat (limited to 'src')
-rw-r--r--src/or/rendservice.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 522f33e5bb..cb87624df5 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3175,8 +3175,8 @@ count_intro_point_circuits(const rend_service_t *service)
*/
STATIC ssize_t
encode_establish_intro_cell_legacy(char *cell_body_out,
- size_t cell_body_out_len,
- crypto_pk_t *intro_key, char *rend_circ_nonce)
+ size_t cell_body_out_len,
+ crypto_pk_t *intro_key, char *rend_circ_nonce)
{
int retval = -1;
int r;