Commit ae94e36a authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge remote-tracking branch 'nickm/bug2497'

parents 51841709 cc351578

changes/bug2749

0 → 100644
+8 −0
Original line number Diff line number Diff line 
  o Changed parameters (authorities):

    - Authorities are now a little more lenient at accepting older

      router descriptors, or newer router descriptors that don't make

      big changes. This should help ameliorate past and future issues

      where routers think they have uploaded valid descriptors, but the

      authorities don't think so. Fix for ticket 2479.

src/or/or.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ 
#define ROUTER_MAX_AGE (60*60*48)

/** How old can a router get before we (as a server) will no longer

 * consider it live? In seconds. */

#define ROUTER_MAX_AGE_TO_PUBLISH (60*60*20)

#define ROUTER_MAX_AGE_TO_PUBLISH (60*60*24)

/** How old do we let a saved descriptor get before force-removing it? */

#define OLD_ROUTER_DESC_MAX_AGE (60*60*24*5)

src/or/routerlist.c

+1 −1
Original line number Diff line number Diff line
@@ -5082,7 +5082,7 @@ router_reset_descriptor_download_failures(void) 


/** Any changes in a router descriptor's publication time larger than this are

 * automatically non-cosmetic. */

#define ROUTER_MAX_COSMETIC_TIME_DIFFERENCE (12*60*60)

#define ROUTER_MAX_COSMETIC_TIME_DIFFERENCE (2*60*60)



/** We allow uptime to vary from how much it ought to be by this much. */

#define ROUTER_ALLOW_UPTIME_DRIFT (6*60*60)