[tor-commits] [tor/master] Drop MAX_REND_FAILURES to 8

[nickm at torproject.org]

commit 2f59d6e2d81cea3005e488e31f824ff1b9b303c4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 2 15:36:13 2014 -0400

    Drop MAX_REND_FAILURES to 8
---
 changes/bug4241      |    3 +++
 src/or/rendservice.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug4241 b/changes/bug4241
new file mode 100644
index 0000000..a7d34bf
--- /dev/null
+++ b/changes/bug4241
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Only retry attempts to connect to a chosen rendezvous point 8 times,
+      not 30. Fixes bug #4241; bugfix on 0.1.0.1-rc.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 500efaf..abd78da 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -82,7 +82,7 @@ typedef struct rend_service_port_config_t {
 #define MAX_INTRO_CIRCS_PER_PERIOD 10
 /** How many times will a hidden service operator attempt to connect to
  * a requested rendezvous point before giving up? */
-#define MAX_REND_FAILURES 30
+#define MAX_REND_FAILURES 8
 /** How many seconds should we spend trying to connect to a requested
  * rendezvous point before giving up? */
 #define MAX_REND_TIMEOUT 30