[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug13126'

[nickm at torproject.org]

commit 3d2366c676233c30133928940b4bc19d8f25f193
Merge: 3a91a08 415a841
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 26 09:03:30 2014 -0500

    Merge remote-tracking branch 'public/bug13126'
    
    Conflicts:
    	src/or/or.h

 changes/bug13126    |   10 +++
 src/or/or.h         |    2 +-
 src/or/routerlist.c |  236 +++------------------------------------------------
 3 files changed, 25 insertions(+), 223 deletions(-)

diff --cc src/or/or.h
index bbb9192,a681def..bff7267
--- a/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 descriptor was rejected because it was older than
 +   * OLD_ROUTER_DESC_MAX_AGE. */
-   ROUTER_WAS_TOO_OLD = -7,
+   ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'NOT_NEW' */
  } was_router_added_t;
  
  /********************************* routerparse.c ************************/