commit 74262f157178071ad1bce8e70aae79dc01f3ba5d Merge: 4ab1012 c5269a5 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 15 12:04:56 2013 -0400

Merge branch 'bug5040_4773_rebase_3'

changes/bug5040 | 4 + src/common/crypto.c | 4 +- src/common/crypto.h | 2 +- src/common/util.c | 6 +- src/common/util.h | 5 +- src/or/buffers.c | 59 ++++ src/or/buffers.h | 8 + src/or/channel.c | 8 +- src/or/channel.h | 2 + src/or/channeltls.c | 27 ++ src/or/config.c | 103 +++++- src/or/config.h | 4 + src/or/connection.c | 65 +++- src/or/connection.h | 10 +- src/or/connection_or.c | 82 ++++- src/or/connection_or.h | 3 +- src/or/control.c | 55 ++-- src/or/control.h | 6 +- src/or/directory.c | 4 +- src/or/ext_orport.c | 648 ++++++++++++++++++++++++++++++++++++ src/or/ext_orport.h | 42 +++ src/or/geoip.c | 168 +++++++++- src/or/geoip.h | 4 +- src/or/include.am | 2 + src/or/main.c | 42 ++- src/or/main.h | 13 +- src/or/or.h | 63 +++- src/or/transports.c | 22 +- src/test/include.am | 3 + src/test/test.c | 803 +++++++-------------------------------------- src/test/test_buffers.c | 342 +++++++++++++++++++ src/test/test_extorport.c | 604 ++++++++++++++++++++++++++++++++++ src/test/test_options.c | 3 +- src/test/test_socks.c | 393 ++++++++++++++++++++++ 34 files changed, 2828 insertions(+), 781 deletions(-)

diff --cc src/test/include.am index fb704d7,74311ac..e3f2795 --- 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 60fbfb1,851ddf0..8693180 --- 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 };