diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-23 09:09:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-23 09:09:33 -0400 |
| commit | 3acee6142221839137607c9a9cbf8ca4feea5993 (patch) | |
| tree | dad6e7660b7b34358221d25a93dc8c2770441fed /src/or/rendcommon.c | |
| parent | 8a951ed15816b028baf30a0606b9a15a39a36601 (diff) | |
| parent | 55118d90ca927d2cdb2cbd92189113da4dcb2fe7 (diff) | |
| download | tor-3acee6142221839137607c9a9cbf8ca4feea5993.tar.gz tor-3acee6142221839137607c9a9cbf8ca4feea5993.zip | |
Merge branch 'feature15652_squashed'
Diffstat (limited to 'src/or/rendcommon.c')
| -rw-r--r-- | src/or/rendcommon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 3fea07f52a..371c6bf9b8 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -529,7 +529,8 @@ rend_encode_v2_descriptors(smartlist_t *descs_out, } /* Base64-encode introduction points. */ ipos_base64 = tor_calloc(ipos_len, 2); - if (base64_encode(ipos_base64, ipos_len * 2, ipos, ipos_len)<0) { + if (base64_encode(ipos_base64, ipos_len * 2, ipos, ipos_len, + BASE64_ENCODE_MULTILINE)<0) { log_warn(LD_REND, "Could not encode introduction point string to " "base64. length=%d", (int)ipos_len); tor_free(ipos_base64); |