Merge branch 'protover_v2_squashed'

diff --cc src/or/dirvote.c
index ae869c906456d4b8dddf339cc52bb0953a8a5327,9b41e8f44988085fdf86ece606ce5c38b8d8cd33..8b195f891424f8a47c142b479197c9f2e5a23db0
--- 1/src/or/dirvote.c
--- 2/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@@ -1580,9 -1706,10 +1706,10 @@@ networkstatus_compute_consensus(smartli
        routerstatus_t rs_out;
        const char *current_rsa_id = NULL;
        const char *chosen_version;
+       const char *chosen_protocol_list;
        const char *chosen_name = NULL;
        int exitsummary_disagreement = 0;
 -      int is_named = 0, is_unnamed = 0, is_running = 0;
 +      int is_named = 0, is_unnamed = 0, is_running = 0, is_valid = 0;
        int is_guard = 0, is_exit = 0, is_bad_exit = 0;
        int naming_conflict = 0;
        int n_listing = 0;

diff --cc src/or/dirvote.h
index 06bfe671bddb770361571a0770da9d3e6b2c412b,a6c847ec25ec7af7dc215154ffce95a94c351747..efd233ef5fac4e6210830bd2c7c81f7e86835f25
--- 1/src/or/dirvote.h
--- 2/src/or/dirvote.h
+++ b/src/or/dirvote.h
@@@ -55,7 -55,7 +55,7 @@@
  #define MIN_SUPPORTED_CONSENSUS_METHOD 13
  
  /** The highest consensus method that we currently support. */
--#define MAX_SUPPORTED_CONSENSUS_METHOD 24
++#define MAX_SUPPORTED_CONSENSUS_METHOD 25
  
  /** Lowest consensus method where microdesc consensuses omit any entry
   * with no microdesc. */
@@@ -99,10 -99,14 +99,18 @@@
   * value(s). */
  #define MIN_METHOD_FOR_SHARED_RANDOM 23
  
 -#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 24
 +/** Lowest consensus method where authorities drop all nodes that don't get
 + * the Valid flag. */
 +#define MIN_METHOD_FOR_EXCLUDING_INVALID_NODES 24
 +
+ /** Lowest consensus method where authorities vote on required/recommended
+  * protocols. */
 -#define MIN_METHOD_FOR_RS_PROTOCOLS 24
++#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 25
+ 
+ /** Lowest consensus method where authorities add protocols to routerstatus
+  * entries. */
++#define MIN_METHOD_FOR_RS_PROTOCOLS 25
+ 
  /** Default bandwidth to clip unmeasured bandwidths to using method >=
   * MIN_METHOD_TO_CLIP_UNMEASURED_BW.  (This is not a consensus method; do not
   * get confused with the above macros.) */

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

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

diff --cc src/or/or.h
Simple merge

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

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.h
Simple merge

diff --cc src/test/test_dir.c
Simple merge