nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of jenkins issues from 12538.

Browse Source
This commit is contained in:
Nick Mathewson 2015-12-21 12:32:20 -05:00
parent 62f97545e4
commit 8ede8d411a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/config.c
View File

@ -4097,9 +4097,13 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem,
char **msg) char **msg)
{ {
*msg = NULL; *msg = NULL;
/* XXX We should possibly be looking at MaxMemInQueues here
* unconditionally. Or we should believe total_mem unconditionally. */
if (total_mem == 0) { if (total_mem == 0) {
if (get_total_system_memory(&total_mem) < 0) if (get_total_system_memory(&total_mem) < 0) {
total_mem = options->MaxMemInQueues; total_mem = options->MaxMemInQueues >= SIZE_MAX ?
SIZE_MAX : options->MaxMemInQueues;
}
} }
if (options->DirCache) { if (options->DirCache) {
if (total_mem < DIRCACHE_MIN_BANDWIDTH) { if (total_mem < DIRCACHE_MIN_BANDWIDTH) {

1
src/test/include.am
View File

@ -193,6 +193,7 @@ noinst_HEADERS+= \
src/test/rend_test_helpers.h \ src/test/rend_test_helpers.h \
src/test/test.h \ src/test/test.h \
src/test/test_helpers.h \ src/test/test_helpers.h \
src/test/test_dir_common.h \
src/test/test_descriptors.inc \ src/test/test_descriptors.inc \
src/test/example_extrainfo.inc \ src/test/example_extrainfo.inc \
src/test/failing_routerdescs.inc \ src/test/failing_routerdescs.inc \