commit d7ccb6a3b1d6f2884bdcd6ff60cddbd826f6e0eb Merge: b551988 e02b6b9 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 18 08:48:20 2013 -0400

Merge branch 'bug8978_rebase_2'

Conflicts: src/test/test_pt.c

src/or/transports.c | 42 ++++++++++++++++++++++++++++------ src/or/transports.h | 6 +++++ src/test/test_pt.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 7 deletions(-)

diff --cc src/or/transports.h index dc68e94,54049e9..126b704 --- a/src/or/transports.h +++ b/src/or/transports.h @@@ -110,13 -113,10 +113,16 @@@ STATIC int parse_smethod_line(const cha STATIC int parse_version(const char *line, managed_proxy_t *mp); STATIC void parse_env_error(const char *line); STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp); +STATIC char *get_transport_options_for_server_proxy(const managed_proxy_t *mp); + +STATIC void managed_proxy_destroy(managed_proxy_t *mp, + int also_terminate_process); +STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server);

+ STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server); + #endif

#endif diff --cc src/test/test_pt.c index 4970cff,cc2b0a9..84b7a59 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@@ -213,8 -220,8 +274,10 @@@ test_pt_get_extrainfo_string(void *arg struct testcase_t pt_tests[] = { PT_LEGACY(parsing), PT_LEGACY(protocol), + { "get_transport_options", test_pt_get_transport_options, TT_FORK, + NULL, NULL }, + { "get_extrainfo_string", test_pt_get_extrainfo_string, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };