- tor-commits - lists.torproject.org

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 13 Feb '12

13 Feb '12

commit f02d60972f10fe99195492dd5b24e4bc690e3d4c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 13 05:15:31 2012 +0000 Update translations for vidalia_installer --- ko/vidalia_ko.po | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index bf84ec1..6e61f84 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2012-02-13 04:45+0000\n" +"PO-Revision-Date: 2012-02-13 04:56+0000\n" "Last-Translator: cwt967 <cwt967(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -218,19 +218,19 @@ msgstr "파이어폭스에 ${TORBUTTON_DESC} 확장 기능 추가" msgctxt "TorbuttonFirefoxNotFound" msgid "Firefox was not found on your system. Not installing Torbutton." -msgstr "" +msgstr "파이어폭스를 찾을 수 없습니다. Torbutton을 설치하지 않습니다. " msgctxt "AppData" msgid "Application Data" -msgstr "" +msgstr "애플리케이션 데이터" msgctxt "AppDataUninstDesc" msgid "Remove saved application data and configuration files." -msgstr "" +msgstr "저장된 애플리케이션 데이터와 환경 설정 파일을 제거합니다. " msgctxt "LanguageCode" msgid "en" -msgstr "" +msgstr "en" msgctxt "FirefoxWarningPageTitle" msgid "Firefox is not installed" @@ -251,6 +251,13 @@ msgid "" "If you would like to install Firefox, please press Cancel, then go\n" "to the Firefox download page at" msgstr "" +"Mozilla Firefox 브라우저가 설치되지 않았습니다. \n" +"Tor는 Internet Explorer와 같은 다른 브라우저와도 동작합니다. \n" +"하지만, 파이어폭스와 사용하는 것이 더 쉽고, \n" +"익명성을 더 잘 유지시켜 줍니다. \n" +"\n" +"파이어폭스를 설치하고 싶으시다면, 취소 버튼을 누르시고,\n" +"파이어폭스 다운로드 센터로 가십시오:" msgctxt "FirefoxWarningPageLowerText" msgid "" @@ -260,5 +267,10 @@ msgid "" "Or, if you would prefer to install Tor without Firefox, simply\n" "press Next to continue." msgstr "" +"파이어폭스 설치가 완료된 후, 다시 한번\n" +"Tor 설치 마법사를 실행해 주십시오. \n" +"\n" +"또, 파이어폭스 없이 설치하시려면,\n" +"다음 버튼을 눌러 계속하십시오. "

1 0

[tor/master] Reinstate TOR_PR_EXTENDED_SERVER_PORT, just a little
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit c08dde7e289a8f99f610a9ec944ec2b84c2f2d5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 00:00:40 2012 -0500 Reinstate TOR_PR_EXTENDED_SERVER_PORT, just a little --- src/or/transports.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 7bdb88a..d279d7a 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -130,7 +130,7 @@ static INLINE void free_execve_args(char **arg); /** Number of environment variables for managed proxy clients/servers. */ #define ENVIRON_SIZE_CLIENT 3 -#define ENVIRON_SIZE_SERVER 6 +#define ENVIRON_SIZE_SERVER 7 /* XXX known to be too high, but that's ok */ /** The first and only supported - at the moment - configuration protocol version. */ @@ -1030,6 +1030,9 @@ set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp) bindaddr_tmp = get_bindaddr_for_server_proxy(mp); tor_asprintf(&bindaddr_env, "TOR_PT_SERVER_BINDADDR=%s", bindaddr_tmp); + strlcpy(extended_env, "TOR_PT_EXTENDED_SERVER_PORT=", + sizeof(extended_env)); + smartlist_add(envs, orport_env); smartlist_add(envs, extended_env); smartlist_add(envs, bindaddr_env); @@ -1120,6 +1123,7 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) router_get_advertised_or_port(options)); tor_asprintf(tmp++, "TOR_PT_SERVER_BINDADDR=%s", bindaddr); tor_asprintf(tmp++, "TOR_PT_SERVER_TRANSPORTS=%s", transports_to_launch); + tor_asprintf(tmp++, "TOR_PT_EXTENDED_SERVER_PORT="); } else { tor_asprintf(tmp++, "TOR_PT_CLIENT_TRANSPORTS=%s", transports_to_launch); }

1 0

[tor/master] Merge branch 'tmp'
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit 765f71cf2a6814ecea527148b52a6396f50be4c1 Merge: b08ba1c c08dde7 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 00:14:17 2012 -0500 Merge branch 'tmp' src/or/transports.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

1 0

[obfsproxy/master] Don't require that ST_ENV_FAIL_EXTENDED_PORT is set
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit e4371155abe397033c666f802a77a911e837762c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 12 09:48:02 2012 +0100 Don't require that ST_ENV_FAIL_EXTENDED_PORT is set --- src/managed.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/managed.c b/src/managed.c index 01814f8..58b96ee 100644 --- a/src/managed.c +++ b/src/managed.c @@ -455,10 +455,10 @@ handle_environment(managed_proxy_t *proxy) if (proxy->is_server) { tmp = getenv("TOR_PT_EXTENDED_SERVER_PORT"); if (!tmp) { - status = ST_ENV_FAIL_EXTENDED_PORT; - goto err; + proxy->vars.extended_port = xstrdup(""); + } else { + proxy->vars.extended_port = xstrdup(tmp); } - proxy->vars.extended_port = xstrdup(tmp); tmp = getenv("TOR_PT_ORPORT"); if (!tmp) {

1 0

[obfsproxy/master] Merge remote-tracking branch 'sebastian/bug5097'
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 01e994abb1a76bcade735fbf5140930cc49ac19c Merge: 9fe5f1c e437115 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 12 23:55:40 2012 -0500 Merge remote-tracking branch 'sebastian/bug5097' src/managed.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 13 Feb '12

13 Feb '12

commit 0da214ab413eeec0d6d946bd53720f40ed954e4d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 13 04:45:32 2012 +0000 Update translations for vidalia_installer --- ko/vidalia_ko.po | 50 +++++++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index dd86bb8..bf84ec1 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -1,5 +1,6 @@ # # Translators: +# <cwt967(a)gmail.com>, 2012. # <cwt967(a)naver.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2012-02-12 09:46+0000\n" -"Last-Translator: cwt96 <cwt967(a)naver.com>\n" +"PO-Revision-Date: 2012-02-13 04:45+0000\n" +"Last-Translator: cwt967 <cwt967(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,23 +105,23 @@ msgstr "Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 msgctxt "VidaliaStartup" msgid "Run At Startup" -msgstr "" +msgstr "윈도우 시작 시 실행" msgctxt "VidaliaStartupDesc" msgid "Automatically run ${VIDALIA_NAME} at startup." -msgstr "" +msgstr "자동으로 윈도우 시작 시에 ${VIDALIA_NAME}을 실행" msgctxt "VidaliaShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "시작 메뉴에 추가" msgctxt "VidaliaShortcutsDesc" msgid "Add ${VIDALIA_NAME} to your Start menu." -msgstr "" +msgstr "${VIDALIA_NAME}를(을) 시작 메뉴에 추가합니다. " msgctxt "VidaliaRunNow" msgid "Run ${VIDALIA_NAME}" -msgstr "" +msgstr "${VIDALIA_NAME} 실행" msgctxt "TorGroupDesc" msgid "" @@ -131,11 +132,11 @@ msgstr "" msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}." -msgstr "" +msgstr "${TOR_DESC} 제거" msgctxt "TorAppDesc" msgid "Install ${TOR_DESC}." -msgstr "" +msgstr "${TOR_DESC} 설치" msgctxt "TorAskOverwriteTorrc" msgid "" @@ -143,22 +144,25 @@ msgid "" "$\n" "Do you want to overwrite it with the default sample configuration file?" msgstr "" +"이미 Tor 설정 파일을 가지고 있습니다. $\n" +"$\n" +"기본 설정 파일로 대체하시겠습니까?" msgctxt "TorDocumentation" msgid "Documentation" -msgstr "" +msgstr "문서" msgctxt "TorDocumentationDesc" msgid "Install ${TOR_NAME} documentation." -msgstr "" +msgstr "${TOR_NAME} 문서 설치" msgctxt "TorShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "시작 메뉴에 추가" msgctxt "TorShortcutsDesc" msgid "Add ${TOR_NAME} to your Start menu." -msgstr "" +msgstr "${TOR_NAME}을 시작 메뉴에 추가합니다." msgctxt "PolipoGroupDesc" msgid "" @@ -168,27 +172,27 @@ msgstr "Polipo는 Tor을 통한 웹 브라우징의 성능을 향상시키기위 msgctxt "PolipoUninstDesc" msgid "Remove ${POLIPO_DESC}." -msgstr "" +msgstr "${POLIPO_DESC} 제거." msgctxt "PolipoAppDesc" msgid "Install ${POLIPO_DESC}." -msgstr "" +msgstr "${POLIPI_DESC} 설치" msgctxt "PolipoShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "시작 메뉴에 추가" msgctxt "PolipoShortcutsDesc" msgid "Add ${POLIPO_NAME} to your Start menu." -msgstr "" +msgstr "${POLIPO_NAME}을 시작 메뉴에 추가합니다. " msgctxt "PolipoStartup" msgid "Run At Startup" -msgstr "" +msgstr "컴퓨터 시작 시 실행" msgctxt "PolipoStartupDesc" msgid "Automatically run ${POLIPO_NAME} at startup." -msgstr "" +msgstr "자동으로 ${POLIPO_NAME}을 컴퓨터 시작 시에 실행합니다. " msgctxt "TorbuttonGroupDesc" msgid "" @@ -198,19 +202,19 @@ msgstr "Torbutton은 익명 웹 브라우징을 빨리 활성화시키고, 비 msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." -msgstr "" +msgstr "${TORBUTTON_DESC} 제거. " msgctxt "TorbuttonAppDesc" msgid "Install ${TORBUTTON_DESC}." -msgstr "" +msgstr "${TORBUTTON_DESC} 설치. " msgctxt "TorbuttonAddToFirefox" msgid "Add to Firefox" -msgstr "" +msgstr "파이어폭스에 추가" msgctxt "TorbuttonAddToFirefoxDesc" msgid "Add the ${TORBUTTON_DESC} extension to Firefox." -msgstr "" +msgstr "파이어폭스에 ${TORBUTTON_DESC} 확장 기능 추가" msgctxt "TorbuttonFirefoxNotFound" msgid "Firefox was not found on your system. Not installing Torbutton."

1 0

[tor/master] integrate recent changes files
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit b08ba1cb6c7e4fb7693500a893c4d4757a531c58 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Feb 12 23:39:30 2012 -0500 integrate recent changes files --- ChangeLog | 17 +++++++++++++++++ changes/bug5065 | 5 ----- changes/bug5082 | 6 ------ changes/bug5084 | 4 ---- changes/bug5097 | 9 --------- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 755ab0d..e8839d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Changes in version 0.2.3.12-alpha - 2012-02-?? o Major bugfixes: + - Fix building when the path to sed, openssl or sha1sum contains + spaces, which is pretty common on Windows. Fixes bug 5065; bugfix + on 0.2.2.1-alpha. - Set the SO_REUSEADDR socket option before we call bind() on outgoing connections. This change should allow busy exit relays to stop running out of available sockets as quickly. Fixes bug 4950; @@ -8,6 +11,14 @@ Changes in version 0.2.3.12-alpha - 2012-02-?? would ask the bridge for microdescriptors, which are only supported in 0.2.3.x and later, and then fail to bootstrap when it didn't get the answers it wanted. Fixes bug 4013; bugfix on 0.2.3.2-alpha. + - Avoid a crash when managed proxies are configured and we receive + HUP signals or configuration values too rapidly. This happens most + commonly when Vidalia tries to attach to Tor or tries to configure + the Tor it's attached to. Fixes bug 5084; bugfix on 0.2.3.6-alpha. + - Properly set up obfsproxy's environment in managed mode. The Tor + Browser Bundle needs LD_LIBRARY_PATH to be passed to obfsproxy, + and when you run your Tor as a daemon, there's no HOME. Fixes bugs + 5076 and 5082; bugfix on 0.2.3.6-alpha. o Minor features: - Use the dead_strip option when building Tor on OS X. This reduces @@ -23,6 +34,12 @@ Changes in version 0.2.3.12-alpha - 2012-02-?? to info: people kept mistaking it for a real problem, whereas it is seldom the problem even when we are failing to bootstrap. Fixes bug 5067; bugfix on 0.2.0.10-alpha. + - Don't put "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200" in a + managed pluggable transport server proxy's environment. + Previously, we would put it there, even though Tor doesn't + implement an 'extended server port' yet, and even though Tor + almost certainly isn't listening to that address. Bugfix on + 0.2.3.6-alpha. - Actually log the heartbeat message every HeartbeatPeriod seconds, not every HeartbeatPeriod + 1 seconds. Fixes bug 4942; bugfix on 0.2.3.1-alpha. Bug reported by Scott Bennett. diff --git a/changes/bug5065 b/changes/bug5065 deleted file mode 100644 index d195313..0000000 --- a/changes/bug5065 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Fix build if path to sed, openssl or sha1sum contains spaces. - This is pretty common on Windows. Fixes bug 5065; bugfix on - 0.2.2.1-alpha. - diff --git a/changes/bug5082 b/changes/bug5082 deleted file mode 100644 index 1278e81..0000000 --- a/changes/bug5082 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes: - - Properly set up obfsproxy's environment in managed mode. On TBB, we - need LD_LIBRARY_PATH to be copied, and when you run your Tor as a - daemon, there's no HOME. Fixes bug 5082 and 5076; bugfix on - 0.2.3.6-alpha. - diff --git a/changes/bug5084 b/changes/bug5084 deleted file mode 100644 index bf175c6..0000000 --- a/changes/bug5084 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Avoid a crash when managed proxies are configured and we receive - HUP signals or configuration values too rapidly. Fixes bug 5084; - bugfix on 0.2.3.6-alpha. diff --git a/changes/bug5097 b/changes/bug5097 deleted file mode 100644 index 770e9b5..0000000 --- a/changes/bug5097 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - - Don't put "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200" in a - managed pluggable transport server proxy's environment. - Previously, we would put it there, even though Tor doesn't - implement an 'extended server port' yet, and even though Tor - almost certainly isn't listening to that address. Bugfix on - 0.2.3.6-alpha. -

1 0

[torspec/master] Update proposal 180, we don't set HOME and PATH in some cases
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 5d8c83d46328a5f6b1363c1cd427d11a11acc82e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Feb 11 21:05:03 2012 +0100 Update proposal 180, we don't set HOME and PATH in some cases --- proposals/180-pluggable-transport.txt | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index b4e8dad..eb180dc 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -256,12 +256,11 @@ Server behavior Managed proxy interface When the Tor client or relay launches a managed proxy, it communicates - via environment variables. At a minimum, it sets: + via environment variables. At a minimum, it sets (in addition to the + normal environment variables inherited from Tor): {Client and server} - "HOME", "PATH" -- as you'd expect. - "TOR_PT_STATE_LOCATION" -- A filesystem directory path where the proxy should store state if it wants to. This directory is not required to exist, but the proxy SHOULD be able to create it if

1 0

[tor/master] Properly set up environment for managed-mode obfsproxy
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 9857ef0fb5854e85fe66b6556916d37568392c8c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Feb 11 21:00:50 2012 +0100 Properly set up environment for managed-mode obfsproxy --- changes/bug5082 | 6 ++++++ src/or/transports.c | 29 +++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/changes/bug5082 b/changes/bug5082 new file mode 100644 index 0000000..1278e81 --- /dev/null +++ b/changes/bug5082 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Properly set up obfsproxy's environment in managed mode. On TBB, we + need LD_LIBRARY_PATH to be copied, and when you run your Tor as a + daemon, there's no HOME. Fixes bug 5082 and 5076; bugfix on + 0.2.3.6-alpha. + diff --git a/src/or/transports.c b/src/or/transports.c index 15d96ca..77d3a86 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -129,8 +129,8 @@ static INLINE void free_execve_args(char **arg); #define SMALLEST_MANAGED_LINE_SIZE 9 /** Number of environment variables for managed proxy clients/servers. */ -#define ENVIRON_SIZE_CLIENT 5 -#define ENVIRON_SIZE_SERVER 8 +#define ENVIRON_SIZE_CLIENT 3 +#define ENVIRON_SIZE_SERVER 6 /** The first and only supported - at the moment - configuration protocol version. */ @@ -1077,6 +1077,8 @@ set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp) #else /* _WIN32 */ +extern char **environ; + /** Prepare the environment envp of managed proxy mp. * envp is allocated on the heap and should be freed by the * caller after its use. */ @@ -1088,27 +1090,31 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) char *state_loc=NULL; char *transports_to_launch=NULL; char *bindaddr=NULL; - char *home_env=NULL; - char *path_env=NULL; + int environ_size=0; + char **environ_tmp = environ; int r = -1; int n_envs = mp->is_server ? ENVIRON_SIZE_SERVER : ENVIRON_SIZE_CLIENT; + while (*environ_tmp) { + environ_size++; + environ_tmp++; + } + environ_tmp = environ; + /* allocate enough space for our env. vars and a NULL pointer */ - *envp = tor_malloc(sizeof(char*)*(n_envs+1)); + *envp = tor_malloc(sizeof(char*)*(environ_size+n_envs+1)); tmp = *envp; state_loc = get_datadir_fname("pt_state/"); /* XXX temp */ transports_to_launch = smartlist_join_strings(mp->transports_to_launch, ",", 0, NULL); - home_env = getenv("HOME"); - path_env = getenv("PATH"); - if (!home_env || !path_env) - goto done; + while (*environ_tmp) { + *tmp = tor_strdup(*environ_tmp); + tmp++, environ_tmp++; + } - tor_asprintf(tmp++, "HOME=%s", home_env); - tor_asprintf(tmp++, "PATH=%s", path_env); tor_asprintf(tmp++, "TOR_PT_STATE_LOCATION=%s", state_loc); tor_asprintf(tmp++, "TOR_PT_MANAGED_TRANSPORT_VER=1"); /* temp */ if (mp->is_server) { @@ -1126,7 +1132,6 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) r = 0; - done: tor_free(state_loc); tor_free(transports_to_launch); tor_free(bindaddr);

1 0

[tor/master] set_managed_proxy_environment() can't fail anymore
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 93414707aec510c253cf150b654b04dab45cf9e9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 12 06:57:35 2012 +0100 set_managed_proxy_environment() can't fail anymore It already couldn't fail on Windows, now it can't fail on non-Windows, either. --- src/or/transports.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 77d3a86..7bdb88a 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -95,7 +95,7 @@ static void set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp); #else -static int set_managed_proxy_environment(char ***envp, +static void set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp); #endif @@ -305,12 +305,8 @@ launch_managed_proxy(managed_proxy_t *mp) char **envp=NULL; /* prepare the environment variables for the managed proxy */ - if (set_managed_proxy_environment(&envp, mp) < 0) { - log_warn(LD_GENERAL, "Could not setup the environment of " - "the managed proxy at '%s'.", mp->argv[0]); - free_execve_args(envp); - return -1; - } + set_managed_proxy_environment(&envp, mp); + tor_assert(envp); retval = tor_spawn_background(mp->argv[0], (const char **)mp->argv, (const char **)envp, &mp->process_handle); @@ -1082,7 +1078,7 @@ extern char **environ; /** Prepare the environment envp of managed proxy mp. * envp is allocated on the heap and should be freed by the * caller after its use. */ -static int +static void set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) { const or_options_t *options = get_options(); @@ -1093,7 +1089,6 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) int environ_size=0; char **environ_tmp = environ; - int r = -1; int n_envs = mp->is_server ? ENVIRON_SIZE_SERVER : ENVIRON_SIZE_CLIENT; while (*environ_tmp) { @@ -1130,13 +1125,9 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) } *tmp = NULL; - r = 0; - tor_free(state_loc); tor_free(transports_to_launch); tor_free(bindaddr); - - return r; } #endif /* _WIN32 */

1 0