aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendclient.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-16 11:10:02 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-16 11:10:02 -0400
commitbe0e26272b3e795b902394acc9b66642fcdc1f21 (patch)
treee02f29a15876f84ea73b4fbf3e43ad483a9c05c0 /src/or/rendclient.c
parent550c03336ccc256dd9221d2cf9fdc5cef1f87908 (diff)
parent0c3b3650aa831183c76b044466e89eaee36d5684 (diff)
downloadtor-be0e26272b3e795b902394acc9b66642fcdc1f21.tar.gz
tor-be0e26272b3e795b902394acc9b66642fcdc1f21.zip
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'src/or/rendclient.c')
-rw-r--r--src/or/rendclient.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index d42024010d..19a8cef1bf 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -271,7 +271,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
extend_info_t *extend_info = rendcirc->build_state->chosen_exit;
int klen;
/* nul pads */
- set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4h(&extend_info->addr));
+ set_uint32(tmp+v3_shift+1, tor_addr_to_ipv4n(&extend_info->addr));
set_uint16(tmp+v3_shift+5, htons(extend_info->port));
memcpy(tmp+v3_shift+7, extend_info->identity_digest, DIGEST_LEN);
klen = crypto_pk_asn1_encode(extend_info->onion_key,