Merge branch 'bug7952_final'

Conflicts:
	src/test/include.am
	src/test/test.c

diff --cc src/or/control.c
index 23e2054f9e66a83f959d0c5a1b3156893aa57ca2,a6caf0d04985d5521b227fba29af7a8066292cf5..7f421a71d507cf4045cff992770357f4fda840e4
mode 100644,100755..100755
--- 1/src/or/control.c
--- 2/src/or/control.c
+++ b/src/or/control.c

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

diff --cc src/or/router.c
index 1f5df4b8989aba287db44507a806bdf55400aa3e,546512869b189413c362117363a05dbe9b25d928..389120be049b3fc93691baf7c7cb969854f980ed
mode 100644,100755..100755
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c

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

diff --cc src/test/include.am
index c59ebb2ade43ee12f5ca196dad6eb583a0926296,c6ef7efe23cb9f7f8985d438d8e565db68644cf0..34bbe6b5e9b032b01f96f43f40b136603fb760d7
--- 1/src/test/include.am
--- 2/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 0e0fc6a4f354485fb3f10818d7388a6fcf64c1eb,d21beb9bbd6d0d9abf819c2621158d7a94ae779f..a53b5b0c81b48ec1ea7cce746be61059cc2f1f92
--- 1/src/test/test.c
--- 2/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
  };