commit f2a5df252f3ba84f2bc98862fc35f9020ce78fd5 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 21 13:10:10 2015 -0500

whoops; really fix the 32-bit builds --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/config.c b/src/or/config.c index 53f2c76..e3d6653 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4102,7 +4102,7 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem, if (total_mem == 0) { if (get_total_system_memory(&total_mem) < 0) { total_mem = options->MaxMemInQueues >= SIZE_MAX ? - SIZE_MAX : options->MaxMemInQueues; + SIZE_MAX : (size_t)options->MaxMemInQueues; } } if (options->DirCache) {