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

[nickm at torproject.org]

commit 245f273aaf6a6189a57d837d5fd76b76cc9b6f8e
Merge: 3ac426a 51e13cd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 8 13:55:02 2014 -0400

    Merge branch 'bug7952_final'
    
    Conflicts:
    	src/test/include.am
    	src/test/test.c

 changes/ticket7952     |    4 +++
 src/or/control.c       |    3 ++
 src/or/policies.c      |   23 ++++++++++++
 src/or/router.c        |   71 ++++++++++++++++++++++++++++--------
 src/or/router.h        |    3 ++
 src/test/include.am    |    1 +
 src/test/test.c        |    2 ++
 src/test/test_policy.c |   93 ++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 186 insertions(+), 14 deletions(-)

diff --cc src/or/control.c
index 23e2054,a6caf0d..7f421a7
mode 100644,100755..100755
--- a/src/or/control.c
+++ b/src/or/control.c
diff --cc src/or/router.c
index 1f5df4b,5465128..389120b
mode 100644,100755..100755
--- a/src/or/router.c
+++ b/src/or/router.c
diff --cc src/test/include.am
index c59ebb2,c6ef7ef..34bbe6b
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -41,8 -36,7 +41,9 @@@ src_test_test_SOURCES = 
  	src/test/test_socks.c \
  	src/test/test_util.c \
  	src/test/test_config.c \
 -        src/test/test_policy.c \
 +	src/test/test_hs.c \
 +	src/test/test_nodelist.c \
++	src/test/test_policy.c \
  	src/ext/tinytest.c
  
  src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
diff --cc src/test/test.c
index 0e0fc6a,d21beb9..a53b5b0
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -1631,13 -1572,7 +1631,14 @@@ extern struct testcase_t cell_queue_tes
  extern struct testcase_t options_tests[];
  extern struct testcase_t socks_tests[];
  extern struct testcase_t extorport_tests[];
 +extern struct testcase_t controller_event_tests[];
 +extern struct testcase_t logging_tests[];
 +extern struct testcase_t backtrace_tests[];
 +extern struct testcase_t hs_tests[];
 +extern struct testcase_t nodelist_tests[];
 +extern struct testcase_t routerkeys_tests[];
 +extern struct testcase_t oom_tests[];
+ extern struct testcase_t exit_policy_tests[];
  
  static struct testgroup_t testgroups[] = {
    { "", test_array },
@@@ -1661,11 -1594,7 +1662,12 @@@
    { "circuitmux/", circuitmux_tests },
    { "options/", options_tests },
    { "extorport/", extorport_tests },
 +  { "control/", controller_event_tests },
 +  { "hs/", hs_tests },
 +  { "nodelist/", nodelist_tests },
 +  { "routerkeys/", routerkeys_tests },
 +  { "oom/", oom_tests },
+   { "policy/" , exit_policy_tests },
    END_OF_GROUPS
  };