diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-02 13:55:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-02 13:55:00 -0400 |
| commit | b2083cba9eb842ae7e85063d5751ddddc7302acb (patch) | |
| tree | 0c08b97253fd8f7f7fd50bda85d1c43f69dd13d0 | |
| parent | c9081bdb74a459f5cf4d6a03ec6619b1bd5e89e8 (diff) | |
| parent | 1e553b6c68b5bffeda07dea5b5adcac9730013dd (diff) | |
| download | tor-b2083cba9eb842ae7e85063d5751ddddc7302acb.tar.gz tor-b2083cba9eb842ae7e85063d5751ddddc7302acb.zip | |
Merge remote-tracking branch 'dgoulet/bug13239_029_01'
| -rw-r--r-- | changes/bug13239 | 4 | ||||
| -rw-r--r-- | src/or/circuituse.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug13239 b/changes/bug13239 new file mode 100644 index 0000000000..17030c923a --- /dev/null +++ b/changes/bug13239 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service client): + - Increase the minimum number of internal circuits we preemptively build + from 2 to 3 so they are available when a client connects to another + onion service. Fixes bug 13239; bugfix on tor-0.1.0.1-rc~460. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 31003ea095..b5959944f1 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1067,7 +1067,7 @@ circuit_predict_and_launch_new(void) if (rep_hist_get_predicted_internal(now, &hidserv_needs_uptime, &hidserv_needs_capacity) && ((num_uptime_internal<2 && hidserv_needs_uptime) || - num_internal<2) + num_internal<3) && router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN) { if (hidserv_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME; |