From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 4 Mar 2014 16:03:30 +0000 (-0500)
Subject: Merge branch 'bug10169_025_v2'
X-Git-Tag: tor-0.2.5.3-alpha~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab225aaf28d7a25a58b5f11f1c59ded80570b594;p=thirdparty%2Ftor.git

Merge branch 'bug10169_025_v2'

Conflicts:
	src/test/test.c
---

ab225aaf28d7a25a58b5f11f1c59ded80570b594
diff --cc src/test/test.c
index 2529e2902a,47ca8e3bd3..9ca3f29a3e
--- a/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
  };