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

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