From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Aug 2013 16:04:56 +0000 (-0400)
Subject: Merge branch 'bug5040_4773_rebase_3'
X-Git-Tag: tor-0.2.5.1-alpha~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74262f157178071ad1bce8e70aae79dc01f3ba5d;p=thirdparty%2Ftor.git

Merge branch 'bug5040_4773_rebase_3'
---

74262f157178071ad1bce8e70aae79dc01f3ba5d
diff --cc src/test/include.am
index fb704d7185,74311ac199..e3f2795f2d
--- a/src/test/include.am
+++ b/src/test/include.am
@@@ -18,9 -18,9 +18,10 @@@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR=
  src_test_test_SOURCES = \
  	src/test/test.c \
  	src/test/test_addr.c \
+ 	src/test/test_buffers.c \
  	src/test/test_cell_formats.c \
  	src/test/test_circuitlist.c \
 +	src/test/test_circuitmux.c \
  	src/test/test_containers.c \
  	src/test/test_crypto.c \
  	src/test/test_cell_queue.c \
diff --cc src/test/test.c
index 60fbfb132c,851ddf026a..8693180950
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -2133,9 -1566,10 +1566,11 @@@ extern struct testcase_t introduce_test
  extern struct testcase_t replaycache_tests[];
  extern struct testcase_t cell_format_tests[];
  extern struct testcase_t circuitlist_tests[];
 +extern struct testcase_t circuitmux_tests[];
  extern struct testcase_t cell_queue_tests[];
  extern struct testcase_t options_tests[];
+ extern struct testcase_t socks_tests[];
+ extern struct testcase_t extorport_tests[];
  
  static struct testgroup_t testgroups[] = {
    { "", test_array },
@@@ -2153,8 -1588,8 +1589,9 @@@
    { "replaycache/", replaycache_tests },
    { "introduce/", introduce_tests },
    { "circuitlist/", circuitlist_tests },
 +  { "circuitmux/", circuitmux_tests },
    { "options/", options_tests },
+   { "extorport/", extorport_tests },
    END_OF_GROUPS
  };