From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 11 Feb 2018 22:00:52 +0000 (-0500)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.4.0-alpha-dev~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=684d57fe8a21ee74b7b66f0035674ccbe0c1f921;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2
---

684d57fe8a21ee74b7b66f0035674ccbe0c1f921
diff --cc src/common/compat.c
index 7fe97488e3,4a1f0013c6..83bb707e17
--- 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, */