diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:15:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:15:40 -0400 |
| commit | d6b2af7a3aba24cf3d77587c41028aad70d59605 (patch) | |
| tree | a6d8687d4055a9e27fbcb406cfb518295469bf0c /src/or/connection.c | |
| parent | c274f825da18f33f12eb78260d1c78d5f685d959 (diff) | |
| parent | e80a032b61e3c793ad0d1627074b8750f7cfec48 (diff) | |
| download | tor-d6b2af7a3aba24cf3d77587c41028aad70d59605.tar.gz tor-d6b2af7a3aba24cf3d77587c41028aad70d59605.zip | |
Merge branch 'bug19180_easy_squashed'
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 9362cf28fe..9eef063f18 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2240,7 +2240,7 @@ connection_send_socks5_connect(connection_t *conn) } else { /* AF_INET6 */ buf[3] = 4; reqsize += 16; - memcpy(buf + 4, tor_addr_to_in6(&conn->addr), 16); + memcpy(buf + 4, tor_addr_to_in6_addr8(&conn->addr), 16); memcpy(buf + 20, &port, 2); } @@ -2697,8 +2697,6 @@ connection_is_rate_limited(connection_t *conn) #ifdef USE_BUFFEREVENTS static struct bufferevent_rate_limit_group *global_rate_limit = NULL; #else -extern int global_read_bucket, global_write_bucket; -extern int global_relayed_read_bucket, global_relayed_write_bucket; /** Did either global write bucket run dry last second? If so, * we are likely to run dry again this second, so be stingy with the |