Merge remote-tracking branch 'public/bug4241'

This commit is contained in:
Nick Mathewson 2014-04-08 12:41:03 -04:00
commit 3ac426afe8
2 changed files with 4 additions and 1 deletions

3
changes/bug4241 Normal file
View File

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

View File

@ -82,7 +82,7 @@ typedef struct rend_service_port_config_t {
#define MAX_INTRO_CIRCS_PER_PERIOD 10 #define MAX_INTRO_CIRCS_PER_PERIOD 10
/** How many times will a hidden service operator attempt to connect to /** How many times will a hidden service operator attempt to connect to
* a requested rendezvous point before giving up? */ * 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 /** How many seconds should we spend trying to connect to a requested
* rendezvous point before giving up? */ * rendezvous point before giving up? */
#define MAX_REND_TIMEOUT 30 #define MAX_REND_TIMEOUT 30