diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-03 09:47:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-03 09:47:57 -0400 |
| commit | 24352d0d70542d43588a5c5a6da3f63a317d049d (patch) | |
| tree | 41737e193e6dc9e663247a27a8ffe652b21b88ea | |
| parent | 8656cbcfc0cdce98d57e8f77d56bc8a69f5568b6 (diff) | |
| parent | 929a8f199bc236c39794f675a7bb8ad00b155257 (diff) | |
| download | tor-24352d0d70542d43588a5c5a6da3f63a317d049d.tar.gz tor-24352d0d70542d43588a5c5a6da3f63a317d049d.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
| -rw-r--r-- | changes/bug11447 | 5 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug11447 b/changes/bug11447 new file mode 100644 index 0000000000..8cd4f5b467 --- /dev/null +++ b/changes/bug11447 @@ -0,0 +1,5 @@ + o Minor features (DoS-resistance): + - Decrease the amount of reattempts that a hidden service is + willing to perform when its rendezvous circuits fail. This + reduces the computational cost for hidden service under heavy + load. Resolves ticket #11447.
\ No newline at end of file diff --git a/src/or/rendservice.c b/src/or/rendservice.c index eb2748c7d8..0cad66da6d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -90,7 +90,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 8 +#define MAX_REND_FAILURES 1 /** How many seconds should we spend trying to connect to a requested * rendezvous point before giving up? */ #define MAX_REND_TIMEOUT 30 |