From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Mar 2017 13:08:28 +0000 (-0500)
Subject: Merge branch 'maint-0.3.0'
X-Git-Tag: tor-0.3.1.1-alpha~233
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad19f1507ac3bfd4b26ae478e61c8ef8c4057f22;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0'
---

ad19f1507ac3bfd4b26ae478e61c8ef8c4057f22
diff --cc src/or/rendservice.c
index 82feeeb8f2,79fec9fd5c..eeccd4347b
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@@ -4091,9 -4077,10 +4100,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;
      }