Merge remote-tracking branch 'origin/maint-0.2.6'

This commit is contained in:
Nick Mathewson 2015-04-03 09:47:57 -04:00
commit 24352d0d70
2 changed files with 6 additions and 1 deletions

5
changes/bug11447 Normal file
View File

@ -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.

View File

@ -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