commit 7f3563058d6b9215fe93116a71db9573e790e017 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 11 11:29:44 2014 -0400

Fix a 32-big conversion warning in 11970 fix --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 9581fac..05b91be 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1352,7 +1352,7 @@ typedef struct cached_getaddrinfo_item_t { static unsigned cached_getaddrinfo_item_hash(const cached_getaddrinfo_item_t *item) { - return siphash24g(item->name, strlen(item->name)) + item->family; + return (unsigned)siphash24g(item->name, strlen(item->name)) + item->family; }

static unsigned