[tor-commits] [tor/master] Merge branch 'bug9321_rerebase'

nickm at torproject.org nickm at torproject.org
Wed Feb 18 14:20:13 UTC 2015


commit 96211bcf714ac739f605dc0b5b8754418080591f
Merge: 164eeef 5c34a53
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 18 09:17:02 2015 -0500

    Merge branch 'bug9321_rerebase'
    
    Conflicts:
    	src/or/dirvote.h
    	src/test/include.am
    	src/test/test_entrynodes.c

 changes/bug9321               |    7 +
 doc/tor.1.txt                 |   11 ++
 src/or/config.c               |    6 +
 src/or/dirserv.c              |  326 ++++++++++++++++++++++++++++++++
 src/or/dirserv.h              |    7 +
 src/or/dirvote.c              |  136 ++++++++++++--
 src/or/dirvote.h              |    9 +-
 src/or/entrynodes.c           |   57 ++++++
 src/or/entrynodes.h           |   16 ++
 src/or/or.h                   |   15 ++
 src/or/routerlist.c           |   42 ++++-
 src/or/routerparse.c          |   65 +++++++
 src/or/routerparse.h          |    7 +
 src/test/include.am           |    3 +
 src/test/test.c               |    2 +
 src/test/test_entrynodes.c    |   14 +-
 src/test/test_guardfraction.c |  418 +++++++++++++++++++++++++++++++++++++++++
 src/test/test_helpers.c       |   26 +++
 src/test/test_helpers.h       |   10 +
 src/test/testhelper.h         |    2 +
 20 files changed, 1146 insertions(+), 33 deletions(-)

diff --cc src/or/dirvote.h
index 20dcbcd,f5ecdaf..542563b
--- a/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
  
 +/** 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 19
++#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/test/include.am
index 71041b1,2b2294f..1c44ff1
--- a/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_entrynodes.c
index a7e18cd,b60b233..3137edb
--- a/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 6b1bde6,0000000..4a6718a
mode 100644,000000..100644
--- a/src/test/testhelper.h
+++ 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
 +





More information about the tor-commits mailing list