Merge branch 'bug10169_025_v2'

Conflicts:
	src/test/test.c

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

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

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

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

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

diff --cc src/test/test.c
index 2529e2902ac6b2c43096c36bdb78553ee37a03c5,47ca8e3bd36ea67b3c46b914e094da36da55ed93..9ca3f29a3e9923a10acc8ae04aef3fb5ebed76df
--- 1/src/test/test.c
--- 2/src/test/test.c
+++ b/src/test/test.c
@@@ -1629,7 -1627,7 +1629,8 @@@ 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[];
  
  static struct testgroup_t testgroups[] = {
    { "", test_array },
@@@ -1655,7 -1653,7 +1656,8 @@@
    { "control/", controller_event_tests },
    { "hs/", hs_tests },
    { "nodelist/", nodelist_tests },
 +  { "routerkeys/", routerkeys_tests },
+   { "oom/", oom_tests },
    END_OF_GROUPS
  };