Merge remote-tracking branch 'public/bug13126'

Conflicts:
	src/or/or.h

diff --cc src/or/or.h
index bbb9192757bc286ac95e4ef6035d9968c14d182d,a681def37c7a444e74b1ceb8e2d8085ca9d98d97..bff7267d37ffa884bb3af0f89b7eee327ed5ff57
--- 1/src/or/or.h
--- 2/src/or/or.h
+++ b/src/or/or.h
@@@ -5001,31 -4998,15 +5001,31 @@@ typedef enum 
  
  /** Return value for router_add_to_routerlist() and dirserv_add_descriptor() */
  typedef enum was_router_added_t {
 +  /* Router was added successfully. */
    ROUTER_ADDED_SUCCESSFULLY = 1,
 +  /* Router descriptor was added with warnings to submitter. */
    ROUTER_ADDED_NOTIFY_GENERATOR = 0,
 +  /* Extrainfo document was rejected because no corresponding router
 +   * descriptor was found OR router descriptor was rejected because
 +   * it was incompatible with its extrainfo document. */
    ROUTER_BAD_EI = -1,
 -  ROUTER_WAS_NOT_NEW = -2,
 +  /* Router descriptor was rejected because it is already known. */
 +  ROUTER_IS_ALREADY_KNOWN = -2,
 +  /* General purpose router was rejected, because it was not listed
 +   * in consensus. */
    ROUTER_NOT_IN_CONSENSUS = -3,
 +  /* Router was neither in directory consensus nor in any of
 +   * networkstatus documents. Caching it to access later.
 +   * (Applies to fetched descriptors only.) */
    ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS = -4,
 +  /* Router was rejected by directory authority. */
    ROUTER_AUTHDIR_REJECTS = -5,
 +  /* Bridge descriptor was rejected because such bridge was not one
 +   * of the bridges we have listed in our configuration. */
    ROUTER_WAS_NOT_WANTED = -6,
-   ROUTER_WAS_TOO_OLD = -7,
 +  /* Router descriptor was rejected because it was older than
 +   * OLD_ROUTER_DESC_MAX_AGE. */
+   ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'NOT_NEW' */
  } was_router_added_t;
  
  /********************************* routerparse.c ************************/

diff --cc src/or/routerlist.c
Simple merge