Merge branch 'bug9321_rerebase'

Conflicts:
	src/or/dirvote.h
	src/test/include.am
	src/test/test_entrynodes.c

diff --cc doc/tor.1.txt
Simple merge

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

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

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

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

diff --cc src/or/dirvote.h
index 20dcbcd5b63ff2aeb3f0456709d1dba215367fde,f5ecdaff7943bf863bd10370211f43352b44c406..542563b7082de6b0b40bcdcb2b8d96e0c4dede84
--- 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 19
++#define MAX_SUPPORTED_CONSENSUS_METHOD 20
  
  /** Lowest consensus method where microdesc consensuses omit any entry
   * with no microdesc. */
@@@ -79,11 -79,12 +79,16 @@@
   * microdescriptors. */
  #define MIN_METHOD_FOR_ID_HASH_IN_MD 18
  
 -#define MIN_METHOD_FOR_GUARDFRACTION 19
 +/** Lowest consensus method where we include "package" lines*/
 +#define MIN_METHOD_FOR_PACKAGE_LINES 19
 +
+ /** Lowest consensus method where authorities may include
+  * GuardFraction information in microdescriptors. */
++#define MIN_METHOD_FOR_GUARDFRACTION 20
+ 
  /** Default bandwidth to clip unmeasured bandwidths to using method >=
-- * MIN_METHOD_TO_CLIP_UNMEASURED_BW */
++ * MIN_METHOD_TO_CLIP_UNMEASURED_BW.  (This is not a consensus method; do not
++ * get confused with the above macros.) */
  #define DEFAULT_MAX_UNMEASURED_BW_KB 20
  
  void dirvote_free_all(void);

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

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

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

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

diff --cc src/test/include.am
index 71041b123798bf86f669a4bac87b98d066309e1c,2b2294f748a9db9bc57f81b137ae52dd753b22c7..1c44ff135f7fe7db64067f8b0723bcff46fd8b9f
--- 1/src/test/include.am
--- 2/src/test/include.am
+++ b/src/test/include.am
@@@ -61,8 -62,8 +62,9 @@@ src_test_test_SOURCES = 
        src/test/test_status.c \
        src/test/test_threads.c \
        src/test/test_util.c \
+       src/test/test_helpers.c \
        src/test/testing_common.c \
 +      src/test/testhelper.c \
        src/ext/tinytest.c
  
  src_test_test_slow_SOURCES = \
@@@ -120,7 -121,7 +122,8 @@@ src_test_test_workqueue_LDADD = src/or/
  noinst_HEADERS+= \
        src/test/fakechans.h \
        src/test/test.h \
 +      src/test/testhelper.h \
+       src/test/test_helpers.h \
        src/test/test_descriptors.inc \
        src/test/example_extrainfo.inc \
        src/test/failing_routerdescs.inc \

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

diff --cc src/test/test_entrynodes.c
index a7e18cdd97822e2e75c259375cb521c5da8577d7,b60b2331db0f80f428bd186836ebd6c97f440d84..3137edb995a830e1d260157eab77cbacd7253695
--- 1/src/test/test_entrynodes.c
--- 2/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@@ -18,7 -18,8 +18,8 @@@
  #include "statefile.h"
  #include "config.h"
  
 -#include "test_descriptors.inc"
 +#include "testhelper.h"
+ #include "test_helpers.h"
  
  /* TODO:
   * choose_random_entry() test with state set.

diff --cc src/test/testhelper.h
index 6b1bde6822424e71de4b038a2199ed87f88f8424,0000000000000000000000000000000000000000..4a6718afa008c0656ecae4b762b4d04f257763e2
mode 100644,000000..100644
--- 1/src/test/testhelper.h
--- /dev/null
+++ b/src/test/testhelper.h
@@@ -1,10 -1,0 +1,12 @@@
 +#ifndef TOR_TEST_HELPER_H
 +#define TOR_TEST_HELPER_H
 +
 +/* Number of descriptors contained in test_descriptors.txt. */
 +#define HELPER_NUMBER_OF_DESCRIPTORS 8
 +
 +void helper_setup_fake_routerlist(void);
 +
++extern const char TEST_DESCRIPTORS[];
++
 +#endif
 +