diff options
| -rw-r--r-- | changes/bug19968 | 11 | ||||
| -rw-r--r-- | changes/bug20401 | 4 | ||||
| -rw-r--r-- | changes/bug20487 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 4 | ||||
| -rw-r--r-- | src/common/compat.c | 1 | ||||
| -rw-r--r-- | src/or/cpuworker.c | 1 |
6 files changed, 24 insertions, 1 deletions
diff --git a/changes/bug19968 b/changes/bug19968 new file mode 100644 index 0000000000..b285706e70 --- /dev/null +++ b/changes/bug19968 @@ -0,0 +1,11 @@ + 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. diff --git a/changes/bug20401 b/changes/bug20401 new file mode 100644 index 0000000000..85ab3c7322 --- /dev/null +++ b/changes/bug20401 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Avoid a small memory leak when informing worker threads about rotated + onion keys. Fixes bug 20401; bugfix on 0.2.6.3-alpha. + diff --git a/changes/bug20487 b/changes/bug20487 new file mode 100644 index 0000000000..4435f14a95 --- /dev/null +++ b/changes/bug20487 @@ -0,0 +1,4 @@ + o Documentation: + - Clarify that setting HiddenServiceNonAnonymousMode requires + you to also set "SOCKSPort 0". Fixes bug 20487; bugfix on + 0.2.9.3-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9d8b631e35..b502e447d0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2434,7 +2434,9 @@ The following options are used to configure a hidden service. [[HiddenServiceNonAnonymousMode]] **HiddenServiceNonAnonymousMode** **0**|**1**:: Makes hidden services non-anonymous on this tor instance. Allows the non-anonymous HiddenServiceSingleHopMode. Enables direct connections in the - server-side hidden service protocol. + server-side hidden service protocol. If you are using this option, + you need to disable all client-side services on your Tor instance, + including setting SOCKSPort to "0". (Default: 0) TESTING NETWORK OPTIONS 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 */ } } diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 26bc54b55c..fd6de6ea7c 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -168,6 +168,7 @@ update_state_threadfn(void *state_, void *work_) server_onion_keys_free(state->onion_keys); state->onion_keys = update->onion_keys; update->onion_keys = NULL; + worker_state_free(update); ++state->generation; return WQ_RPL_REPLY; } |