From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Apr 2017 13:28:33 +0000 (-0400)
Subject: Merge remote-tracking branch 'teor/bug21596_030' into maint-0.3.0
X-Git-Tag: tor-0.3.0.5-rc~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a06c46533392751b8fbcfd231233624f63d39dc6;p=thirdparty%2Ftor.git

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

a06c46533392751b8fbcfd231233624f63d39dc6
diff --cc src/or/rendservice.c
index 79fec9fd5c,c04f5bb6e7..fb777ca154
--- 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;
      }