[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'teor/bug21596_030' into maint-0.3.0

[nickm at torproject.org]

commit a06c46533392751b8fbcfd231233624f63d39dc6
Merge: 5d8061c e0486c9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 3 09:28:33 2017 -0400

    Merge remote-tracking branch 'teor/bug21596_030' into maint-0.3.0

 changes/bug21596     |  5 +++++
 src/or/rendservice.c | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --cc src/or/rendservice.c
index 79fec9f,c04f5bb..fb777ca
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@@ -4077,10 -3941,9 +4081,10 @@@ rend_consider_services_intro_points(voi
        service->intro_period_started = now;
        service->n_intro_circuits_launched = 0;
      } else if (service->n_intro_circuits_launched >=
 -               MAX_INTRO_CIRCS_PER_PERIOD) {
 +               rend_max_intro_circs_per_period(
 +                                      service->n_intro_points_wanted)) {
        /* We have failed too many times in this period; wait for the next
-        * one before we try again. */
+        * one before we try to initiate any more connections. */
        continue;
      }