commit 684d57fe8a21ee74b7b66f0035674ccbe0c1f921 Merge: 4de20d175 eccef6ba6 Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 11 17:00:52 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

changes/bug21074_downgrade | 4 ++++ src/common/compat.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

diff --cc src/common/compat.c index 7fe97488e,4a1f0013c..83bb707e1 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -1753,14 -1752,13 +1754,13 @@@ set_max_file_descriptors(rlim_t limit, (unsigned long)try_limit, (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); } - bad = 0; + couldnt_set = 0; } } -#endif /* OPEN_MAX */ +#endif /* defined(OPEN_MAX) */ - if (bad) { + if (couldnt_set) { log_warn(LD_CONFIG,"Couldn't set maximum number of file descriptors: %s", - strerror(errno)); - return -1; + strerror(setrlimit_errno)); } } /* leave some overhead for logs, etc, */