Commit e712b5d7 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'bug19968_029' into maint-0.2.9

parents 24b7b922 becc9578

changes/bug19968

0 → 100644
+11 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (relay):

    - Do not try to parallelize workers more than 16x without the

      user explicitly configuring us to do so, even if we do detect more than

      16 CPU cores. Fixes bug 19968; bugfix on

      0.2.3.1-alpha.





  o Minor bugfixes (testing):

    - Avoid a unit test failure on systems with over 16 detectable

      CPU cores. Fixes bug 19968; bugfix on

      0.2.3.1-alpha.

src/common/compat.c

+1 −0
Original line number Diff line number Diff line
@@ -2818,6 +2818,7 @@ compute_num_cpus(void) 
                 "will not autodetect any more than %d, though.  If you "

                 "want to configure more, set NumCPUs in your torrc",

                 num_cpus, MAX_DETECTABLE_CPUS);

      num_cpus = MAX_DETECTABLE_CPUS;

      /* LCOV_EXCL_STOP */

    }

  }