Merge branch 'bug5040_4773_rebase_3'

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

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

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

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

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

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

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

diff --cc src/test/include.am
index fb704d7185fc46005ec884cf8343ed67f4eafe98,74311ac19958102d1956fd3b66ccde51902b38c6..e3f2795f2dd147dceaecb29cb3a2e93d68d0a2ec
--- 1/src/test/include.am
--- 2/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 60fbfb132cc2d0879f6bd1f7dde648eeb40561de,851ddf026a531039de735382ff70b6b762ec14db..86931809505af082bb9e00b27539decc814f6a7e
--- 1/src/test/test.c
--- 2/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
  };