[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm at torproject.org]

commit ad19f1507ac3bfd4b26ae478e61c8ef8c4057f22
Merge: 88b91d7 552bc39
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 7 08:08:28 2017 -0500

    Merge branch 'maint-0.3.0'

 changes/bug21594     |  5 +++++
 src/or/rendservice.c | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --cc src/or/rendservice.c
index 82feeeb,79fec9f..eeccd43
--- 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;
      }