diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-31 16:33:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-31 16:33:03 -0400 |
| commit | e712b5d784db912f7924f090b918888125aa6bcf (patch) | |
| tree | 8955c15bc39c75f6ac4dba0098ec3f54544fee2b /src | |
| parent | 24b7b922ae9adc814890feae661ad64f474307f3 (diff) | |
| parent | becc95783979cf1879e6390aad80781d0ce3ea66 (diff) | |
| download | tor-e712b5d784db912f7924f090b918888125aa6bcf.tar.gz tor-e712b5d784db912f7924f090b918888125aa6bcf.zip | |
Merge branch 'bug19968_029' into maint-0.2.9
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 3fde2b3089..4f2f9778f2 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -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 */ } } |