Merge branch 'maint-0.3.0'

diff --cc src/or/rendservice.c
index 82feeeb8f2b38a90b12718e7a7fcf2a42a376148,79fec9fd5c7ef3f723c4c963f6334a84ecac1ddd..eeccd4347bb6fa6753372ac4b0ae0329e61b5fe9
--- 1/src/or/rendservice.c
--- 2/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;
      }