From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 18 Jul 2013 12:48:20 +0000 (-0400)
Subject: Merge branch 'bug8978_rebase_2'
X-Git-Tag: tor-0.2.5.1-alpha~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7ccb6a3b1d6f2884bdcd6ff60cddbd826f6e0eb;p=thirdparty%2Ftor.git

Merge branch 'bug8978_rebase_2'

Conflicts:
	src/test/test_pt.c
---

d7ccb6a3b1d6f2884bdcd6ff60cddbd826f6e0eb
diff --cc src/or/transports.h
index dc68e946f2,54049e93d6..126b7046a6
--- 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 4970cfff44,cc2b0a965d..84b7a59ef0
--- 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
  };