diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-17 19:32:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-17 19:32:08 -0400 |
| commit | d5e4b6983f88d6a31303008897e6f75e9a9777ff (patch) | |
| tree | 82bc7466e3363bb13a123e152ec832311810c35a /src/or | |
| parent | 987174cc6fb4915299236fd76e3bb6c893e78653 (diff) | |
| parent | 39bbb8d9cfb0258b1e65dc98177e0773a19e4eb0 (diff) | |
| download | tor-d5e4b6983f88d6a31303008897e6f75e9a9777ff.tar.gz tor-d5e4b6983f88d6a31303008897e6f75e9a9777ff.zip | |
Merge remote-tracking branch 'rl1987/bug26282'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/control.c | 2 | ||||
| -rw-r--r-- | src/or/geoip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index 0d637dce7a..95b16cf5a8 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4624,7 +4624,7 @@ handle_control_add_onion(control_connection_t *conn, static const char *max_s_prefix = "MaxStreams="; static const char *auth_prefix = "ClientAuth="; - const char *arg = smartlist_get(args, i); + const char *arg = smartlist_get(args, (int)i); if (!strcasecmpstart(arg, port_prefix)) { /* "Port=VIRTPORT[,TARGET]". */ const char *port_str = arg + strlen(port_prefix); diff --git a/src/or/geoip.c b/src/or/geoip.c index 2c917c564d..d59043a7f6 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -150,7 +150,7 @@ geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high, idx = ((uintptr_t)idxplus1_)-1; } { - geoip_country_t *c = smartlist_get(geoip_countries, idx); + geoip_country_t *c = smartlist_get(geoip_countries, (int)idx); tor_assert(!strcasecmp(c->countrycode, country)); } |