diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-08 12:41:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-08 12:41:03 -0400 |
| commit | 3ac426afe8f169cb2c16de9d37b8630b7c3216f5 (patch) | |
| tree | 2c4bbc637199015c876790874279795c9ad4a310 | |
| parent | fffc59b0e941f12e1588e0604c8295ecc0679150 (diff) | |
| parent | 2f59d6e2d81cea3005e488e31f824ff1b9b303c4 (diff) | |
| download | tor-3ac426afe8f169cb2c16de9d37b8630b7c3216f5.tar.gz tor-3ac426afe8f169cb2c16de9d37b8630b7c3216f5.zip | |
Merge remote-tracking branch 'public/bug4241'
| -rw-r--r-- | changes/bug4241 | 3 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug4241 b/changes/bug4241 new file mode 100644 index 0000000000..a7d34bf6a3 --- /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 500efaf208..abd78da73a 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 |