June 2020 - tor-commits - lists.torproject.org

[tor/master] Check that fmt_addr32() returned non-empty string before putting it into documents
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 8ab7e30484c307ade39277488b954a5f21b5f6e5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 19:09:53 2020 +0300 Check that fmt_addr32() returned non-empty string before putting it into documents --- src/feature/dirauth/dirvote.c | 78 +++++++++++++++++---------------- src/feature/nodelist/fmt_routerstatus.c | 23 +++++----- 2 files changed, 54 insertions(+), 47 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 6bf30d083..c8b4637e6 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -322,43 +322,47 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, tor_free(digest_algo_b64_digest_bw_file); } - smartlist_add_asprintf(chunks, - "network-status-version 3\n" - "vote-status %s\n" - "consensus-methods %s\n" - "published %s\n" - "valid-after %s\n" - "fresh-until %s\n" - "valid-until %s\n" - "voting-delay %d %d\n" - "%s%s" /* versions */ - "%s" /* protocols */ - "known-flags %s\n" - "flag-thresholds %s\n" - "params %s\n" - "%s" /* bandwidth file headers */ - "%s" /* bandwidth file digest */ - "dir-source %s %s %s %s %d %d\n" - "contact %s\n" - "%s" /* shared randomness information */ - , - v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", - methods, - published, va, fu, vu, - v3_ns->vote_seconds, v3_ns->dist_seconds, - client_versions_line, - server_versions_line, - protocols_lines, - flags, - flag_thresholds, - params, - bw_headers_line ? bw_headers_line : "", - bw_file_digest ? bw_file_digest: "", - voter->nickname, fingerprint, voter->address, - fmt_addr32(addr), voter->dir_port, voter->or_port, - voter->contact, - shared_random_vote_str ? - shared_random_vote_str : ""); + const char *ip_str = fmt_addr32(addr); + + if (ip_str[0]) { + smartlist_add_asprintf(chunks, + "network-status-version 3\n" + "vote-status %s\n" + "consensus-methods %s\n" + "published %s\n" + "valid-after %s\n" + "fresh-until %s\n" + "valid-until %s\n" + "voting-delay %d %d\n" + "%s%s" /* versions */ + "%s" /* protocols */ + "known-flags %s\n" + "flag-thresholds %s\n" + "params %s\n" + "%s" /* bandwidth file headers */ + "%s" /* bandwidth file digest */ + "dir-source %s %s %s %s %d %d\n" + "contact %s\n" + "%s" /* shared randomness information */ + , + v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", + methods, + published, va, fu, vu, + v3_ns->vote_seconds, v3_ns->dist_seconds, + client_versions_line, + server_versions_line, + protocols_lines, + flags, + flag_thresholds, + params, + bw_headers_line ? bw_headers_line : "", + bw_file_digest ? bw_file_digest: "", + voter->nickname, fingerprint, voter->address, + ip_str, voter->dir_port, voter->or_port, + voter->contact, + shared_random_vote_str ? + shared_random_vote_str : ""); + } tor_free(params); tor_free(flags); diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index 0cf4a6eea..6cecbf4df 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -53,20 +53,23 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, char digest64[BASE64_DIGEST_LEN+1]; smartlist_t *chunks = smartlist_new(); + const char *ip_str = fmt_addr32(rs->addr); + format_iso_time(published, rs->published_on); digest_to_base64(identity64, rs->identity_digest); digest_to_base64(digest64, rs->descriptor_digest); - smartlist_add_asprintf(chunks, - "r %s %s %s%s%s %s %d %d\n", - rs->nickname, - identity64, - (format==NS_V3_CONSENSUS_MICRODESC)?"":digest64, - (format==NS_V3_CONSENSUS_MICRODESC)?"":" ", - published, - fmt_addr32(rs->addr), - (int)rs->or_port, - (int)rs->dir_port); + if (ip_str[0]) + smartlist_add_asprintf(chunks, + "r %s %s %s%s%s %s %d %d\n", + rs->nickname, + identity64, + (format==NS_V3_CONSENSUS_MICRODESC)?"":digest64, + (format==NS_V3_CONSENSUS_MICRODESC)?"":" ", + published, + ip_str, + (int)rs->or_port, + (int)rs->dir_port); /* TODO: Maybe we want to pass in what we need to build the rest of * this here, instead of in the caller. Then we could use the

1 0

[tor/master] Actually, bail out of routerstatus_format_entry() if fmt_addr32() fails
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 38cbfda119558877aeb4fa81578f0d0f6962d03e Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 19:54:47 2020 +0300 Actually, bail out of routerstatus_format_entry() if fmt_addr32() fails --- src/feature/nodelist/fmt_routerstatus.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index 6cecbf4df..ca4a31263 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -54,22 +54,23 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, smartlist_t *chunks = smartlist_new(); const char *ip_str = fmt_addr32(rs->addr); + if (ip_str[0] == '\0') + goto err; format_iso_time(published, rs->published_on); digest_to_base64(identity64, rs->identity_digest); digest_to_base64(digest64, rs->descriptor_digest); - if (ip_str[0]) - smartlist_add_asprintf(chunks, - "r %s %s %s%s%s %s %d %d\n", - rs->nickname, - identity64, - (format==NS_V3_CONSENSUS_MICRODESC)?"":digest64, - (format==NS_V3_CONSENSUS_MICRODESC)?"":" ", - published, - ip_str, - (int)rs->or_port, - (int)rs->dir_port); + smartlist_add_asprintf(chunks, + "r %s %s %s%s%s %s %d %d\n", + rs->nickname, + identity64, + (format==NS_V3_CONSENSUS_MICRODESC)?"":digest64, + (format==NS_V3_CONSENSUS_MICRODESC)?"":" ", + published, + ip_str, + (int)rs->or_port, + (int)rs->dir_port); /* TODO: Maybe we want to pass in what we need to build the rest of * this here, instead of in the caller. Then we could use the

1 0

[tor/master] Check output value of tor_inet_ntop/tor_inet_ntoa in dns.c
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit b5bfdbfd41e38ac73d6655ff3da5a06b66f54d8a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 18:07:14 2020 +0300 Check output value of tor_inet_ntop/tor_inet_ntoa in dns.c --- src/feature/relay/dns.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 4dcf5b703..26e9c6bf1 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -1591,12 +1591,17 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses, } else if (type == DNS_IPv6_AAAA && count) { char answer_buf[TOR_ADDR_BUF_LEN]; char *escaped_address; + const char *ip_str; struct in6_addr *addrs = addresses; tor_addr_from_in6(&addr, &addrs[0]); - tor_inet_ntop(AF_INET6, &addrs[0], answer_buf, sizeof(answer_buf)); + ip_str = tor_inet_ntop(AF_INET6, &addrs[0], answer_buf, + sizeof(answer_buf)); escaped_address = esc_for_log(string_address); - if (answer_is_wildcarded(answer_buf)) { + if (BUG(ip_str == NULL)) { + log_warn(LD_EXIT, "tor_inet_ntop() failed!"); + result = DNS_ERR_NOTEXIST; + } else if (answer_is_wildcarded(answer_buf)) { log_debug(LD_EXIT, "eventdns said that %s resolves to ISP-hijacked " "address %s; treating as a failure.", safe_str(escaped_address), @@ -1863,6 +1868,7 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl, void *addresses, void *arg) { (void)ttl; + const char *ip_str; ++n_wildcard_requests; if (result == DNS_ERR_NONE && count) { char *string_address = arg; @@ -1872,16 +1878,22 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl, for (i = 0; i < count; ++i) { char answer_buf[INET_NTOA_BUF_LEN+1]; struct in_addr in; + int ntoa_res; in.s_addr = addrs[i]; - tor_inet_ntoa(&in, answer_buf, sizeof(answer_buf)); - wildcard_increment_answer(answer_buf); + ntoa_res = tor_inet_ntoa(&in, answer_buf, sizeof(answer_buf)); + tor_assert_nonfatal(ntoa_res > 0); + if (ntoa_res > 0) + wildcard_increment_answer(answer_buf); } } else if (type == DNS_IPv6_AAAA) { const struct in6_addr *addrs = addresses; for (i = 0; i < count; ++i) { char answer_buf[TOR_ADDR_BUF_LEN+1]; - tor_inet_ntop(AF_INET6, &addrs[i], answer_buf, sizeof(answer_buf)); - wildcard_increment_answer(answer_buf); + ip_str = tor_inet_ntop(AF_INET6, &addrs[i], answer_buf, + sizeof(answer_buf)); + tor_assert_nonfatal(ip_str); + if (ip_str) + wildcard_increment_answer(answer_buf); } }

1 0

[tor/master] Add changes file
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 17c4e489e95e808a74696d6e46d50dc136d46f10 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 19:42:41 2020 +0300 Add changes file --- changes/ticket33788 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket33788 b/changes/ticket33788 new file mode 100644 index 000000000..236c05662 --- /dev/null +++ b/changes/ticket33788 @@ -0,0 +1,4 @@ + o Minor features (code safety): + - Check for failures of tor_inet_ntop() and tor_inet_ntoa() functions in + DNS and IP address processing code and adjust codepaths to make them + less likely to crash entire Tor instance. Resolves issue 33788.

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit 20089afb699ffe8bdf02528d284ff5c4b4a08f62 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 12:23:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+el.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contents+el.po b/contents+el.po index b6d5292a47..e1cad015f4 100644 --- a/contents+el.po +++ b/contents+el.po @@ -229,7 +229,7 @@ msgstr "" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) msgid "Download Tor Source Code" -msgstr "" +msgstr "Λήψη του πηγαίου κώδικα Tor" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.title) @@ -936,15 +936,15 @@ msgstr "" #: templates/download-android.html:27 templates/download-android.html:30 #: templates/download-android.html:33 templates/download-android.html:36 msgid "Download .apk" -msgstr "" +msgstr "Λήψη .apk" #: templates/download-android.html:39 msgid "Go to Google Play" -msgstr "" +msgstr "Μετάβαση στο Google Play" #: templates/download-android.html:41 msgid "Go to F-Droid" -msgstr "" +msgstr "Μετάβαση στο F-Droid" #: templates/download-android.html:48 msgid "Are you an iOS user? We encourage you to try Onion Browser." @@ -960,11 +960,11 @@ msgstr "Windows" #: templates/download-languages.html:13 msgid "macOS" -msgstr "" +msgstr "macOS" #: templates/download-languages.html:14 templates/download-options.html:14 msgid "GNU/Linux" -msgstr "" +msgstr "GNU/Linux" #: templates/download-options.html:13 msgid "MacOS" @@ -972,11 +972,11 @@ msgstr "MacOS" #: templates/download-options.html:43 msgid "Tor Browser for Android Alpha" -msgstr "" +msgstr "Περιηγητής Tor για Android Alpha" #: templates/download-options.html:49 msgid "Google Play" -msgstr "" +msgstr "Google Play" #: templates/download-tor.html:8 msgid "Tor Source" @@ -1000,7 +1000,7 @@ msgstr "" #: templates/download-tor.html:46 msgid "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE" -msgstr "" +msgstr "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME,και Windows 98SE" #: templates/download-tor.html:47 msgid "Contains just Tor and nothing else." @@ -1107,11 +1107,11 @@ msgstr "" #: templates/hero-download.html:43 msgid "Download for Android" -msgstr "" +msgstr "Λήψη για Android" #: templates/hero-download.html:49 msgid "Download in another language or platform" -msgstr "" +msgstr "Λήψη για άλλη γλώσσα ή πλατφόρμα" #: templates/hero-download.html:50 msgid "Download the latest alpha build"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit c0f0a915653e5d4c0258fbbc14c237bf49677abd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 12:20:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+el.po | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/contents+el.po b/contents+el.po index 118733effe..6735debe90 100644 --- a/contents+el.po +++ b/contents+el.po @@ -1,3 +1,4 @@ +# # Translators: # A Papac <ap909219(a)protonmail.com>, 2019 # LaScapigliata <ditri2000(a)hotmail.com>, 2019 @@ -9,6 +10,7 @@ # erinm, 2020 # Adrian Pappas <pappasadrian(a)gmail.com>, 2020 # Sofia K., 2020 +# george k <norhorn(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -16,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Sofia K., 2020\n" +"Last-Translator: george k <norhorn(a)gmail.com>, 2020\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,7 +88,7 @@ msgstr "Γίνεται λήψη" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Running Tor Browser for the First Time" -msgstr "" +msgstr "Εκτέλεση του περιηγητή Tor για πρώτη φορά" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -106,7 +108,7 @@ msgstr "Γέφυρες" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Managing Identities" -msgstr "" +msgstr "Διαχείριση ταυτοτήτων" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -165,7 +167,7 @@ msgstr "Πως να γίνετε μεταφραστής του Tor" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Making Tor Browser Portable" -msgstr "" +msgstr "Κάντε τον περιηγητή Tor φορητό" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -614,6 +616,10 @@ msgid "" "at a certain point, see the [Troubleshooting](../troubleshooting) page for " "help solving the problem." msgstr "" +"Εάν βρίσκεστε σε σχετικά γρήγορη σύνδεση, αλλά αυτή η μπάρα φαίνεται να " +"κολλάει σε κάποιο σημείο, ανατρέξτε στη σελίδα " +"[Troubleshooting](../troubleshooting) για βοήθεια σχετικά με την επίλυση του" +" προβλήματος." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -631,6 +637,8 @@ msgid "" "If you know that your connection is censored or uses a proxy, you should " "select this option." msgstr "" +"Αν γνωρίζετε πως η σύνδεσή σας λογοκρίνεται ή χρησιμοποιεί proxy, επιλέξτε " +"αυτή την επιλογή." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -647,7 +655,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" -msgstr "" +msgstr "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body)

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit 31d10bc62b24b6aef8b683da93ac59048e588c7b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 11:18:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el.po b/el.po index 4b1b2a391e..00a1b081b5 100644 --- a/el.po +++ b/el.po @@ -30,7 +30,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" "PO-Revision-Date: 2020-06-03 07:11+0000\n" -"Last-Translator: george kitsoukakis <norhorn(a)gmail.com>\n" +"Last-Translator: george k <norhorn(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[onionperf/master] Removes unused traffic-model argument
by karsten＠torproject.org 05 Jun '20

05 Jun '20

commit 3e9dc4a577b3772dd7716d30cf8c5a22d110a839 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu Jun 4 15:55:24 2020 +0100 Removes unused traffic-model argument --- onionperf/onionperf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index bc95e2b..6078d46 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -212,13 +212,6 @@ def main(): action="store", dest="nickname", default=hostname) - measure_parser.add_argument('-m', '--traffic-model', - help="""a file PATH to a TGen graphml XML traffic model, to use *instead* of the -built-in Torperf (50KiB, 1MiB, 5MiB) traffic model""", - metavar="PATH", type=type_str_path_in, - action="store", dest="model", - default=None) - measure_parser.add_argument('-p', '--prefix', help="""a directory PATH prefix where OnionPerf will run""", metavar="PATH", type=type_str_dir_path_out,

1 0

[onionperf/master] Remove documentation for --traffic-model parameter.
by karsten＠torproject.org 05 Jun '20

05 Jun '20

commit 17b0cf422adc81d356d1db4aba46b495e9487d0b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 5 09:14:02 2020 +0200 Remove documentation for --traffic-model parameter. --- onionperf/docs/onionperf.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/onionperf/docs/onionperf.rst b/onionperf/docs/onionperf.rst index 51e30a6..b16c79e 100644 --- a/onionperf/docs/onionperf.rst +++ b/onionperf/docs/onionperf.rst @@ -168,11 +168,6 @@ A oneshot measurement will run only until one successful download has completed. The 'SOURCE' STRING to use in stats files produced by OnionPerf (default: hostname of the current machine) :: ---traffic-model PATH - -A file PATH to a TGen graphml XML traffic model, to use instead of the built-in Torperf traffic model (default: None) -:: - --prefix PATH A directory PATH prefix where OnionPerf will run (default: current directory)

1 0

[onionperf/master] Make -o/-i arguments mutually exclusive.
by karsten＠torproject.org 05 Jun '20

05 Jun '20

commit 2a506d6ab1c626d70f00d45fb310c0c59bca4907 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 26 23:05:02 2020 +0200 Make -o/-i arguments mutually exclusive. Right now, it's possible to specify both -o and -i at the same time, which doesn't make any sense. Also, it's rather non-intuitive that both argument defaults are True and that setting either of them changes their value to False. This patch fixes both issues above. Fixes #34316. --- onionperf/onionperf | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index f430c3f..bc95e2b 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -194,15 +194,17 @@ def main(): action="store", dest="tgenconnectport", default=8080) - measure_parser.add_argument('-o', '--onion-only', - help="""disable measuring download times over Tor back to {0}""".format(hostname), - action="store_false", dest="do_inet", - default=True) + onion_or_inet_only_group = measure_parser.add_mutually_exclusive_group() - measure_parser.add_argument('-i', '--inet-only', - help="""disable measuring download times over Tor to an ephemeral onion service""", - action="store_false", dest="do_onion", - default=True) + onion_or_inet_only_group.add_argument('-o', '--onion-only', + help="""only measure download times over Tor to an ephemeral onion service""", + action="store_true", dest="onion_only", + default=False) + + onion_or_inet_only_group.add_argument('-i', '--inet-only', + help="""only measure download times over Tor exiting to a public webserver""", + action="store_true", dest="inet_only", + default=False) measure_parser.add_argument('-n', '--nickname', help="""the 'SOURCE' STRING to use in measurement result files produced by OnionPerf""", @@ -352,7 +354,7 @@ def measure(args): server_tor_socks_port = util.get_random_free_port() meas = Measurement(args.torpath, args.tgenpath, args.prefix, args.private_prefix, args.nickname, args.oneshot, args.additional_client_conf, args.torclient_conf_file, args.torserver_conf_file) - meas.run(do_onion=args.do_onion, do_inet=args.do_inet, + meas.run(do_onion=not args.inet_only, do_inet=not args.onion_only, client_tgen_listen_port=client_tgen_port, client_tgen_connect_ip=client_connect_ip, client_tgen_connect_port=client_connect_port, client_tor_ctl_port=client_tor_ctl_port, client_tor_socks_port=client_tor_socks_port, server_tgen_listen_port=server_tgen_port, server_tor_ctl_port=server_tor_ctl_port, server_tor_socks_port=server_tor_socks_port) else:

1 0