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

[nickm at torproject.org]

commit ab225aaf28d7a25a58b5f11f1c59ded80570b594
Merge: bfa0e02 bb37544
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 4 11:03:30 2014 -0500

    Merge branch 'bug10169_025_v2'
    
    Conflicts:
    	src/test/test.c

 changes/bug10169             |    4 +
 changes/bug9686              |    3 +
 doc/tor.1.txt                |   10 +-
 src/common/compat_libevent.c |   44 +++++-
 src/common/compat_libevent.h |    4 +
 src/or/buffers.c             |  109 ++++++++++++-
 src/or/buffers.h             |    8 +-
 src/or/circuitlist.c         |  167 ++++++++++++++++----
 src/or/circuitlist.h         |    7 +-
 src/or/config.c              |    9 +-
 src/or/or.h                  |    8 +-
 src/or/relay.c               |   17 ++-
 src/or/relay.h               |    2 +
 src/test/include.am          |    1 +
 src/test/test.c              |    2 +
 src/test/test_buffers.c      |  265 +++++++++++++++++++++++++++++++-
 src/test/test_oom.c          |  348 ++++++++++++++++++++++++++++++++++++++++++
 17 files changed, 946 insertions(+), 62 deletions(-)

diff --cc src/test/test.c
index 2529e29,47ca8e3..9ca3f29
--- 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
  };