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

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Jan '20

15 Jan '20

commit a0e5f2900714f72b4c391502274b09c0197f768c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 20:23:57 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 53 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index e5051457a2..034940f35c 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -365,6 +365,9 @@ msgid "" "[article](https://blog.torproject.org/browser-fingerprinting-introduction-" "and-challenges-ahead) on The Tor Blog all about it." msgstr "" +"Хотите узнать больше о браузерных отпечатках? Им посвящена [целая " +"статья](https://blog.torproject.org/browser-fingerprinting-introduction-and-" +"challenges-ahead) в блоге Tor." #: https//support.torproject.org/faq/faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.title) @@ -383,6 +386,10 @@ msgid "" "[Linux](https://www.torproject.org/download/) and " "[macOS](https://www.torproject.org/download/)." msgstr "" +"Сегодня Tor Browser доступен для " +"[Windows](https://www.torproject.org/ru/download/) для " +"[Linux](https://www.torproject.org/ru/download/) и " +"[macOS](https://www.torproject.org/ru/download/)." #: https//support.torproject.org/faq/faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.description) @@ -395,6 +402,11 @@ msgid "" "app](https://play.google.com/store/apps/details?id=org.torproject.android) " "to route other apps on your Android device over the Tor network." msgstr "" +"Есть версия Tor Browser для " +"[Android](https://www.torproject.org/ru/download/#android). [The Guardian " +"Project](https://guardianproject.info) также предлагает приложение " +"[Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)," +" с помощью которого весь трафик Android-устройства проходит через сеть Tor." #: https//support.torproject.org/faq/faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.description) @@ -480,11 +492,15 @@ msgid "" "If we ever put a deliberate backdoor in our security software, it would ruin" " our professional reputation." msgstr "" +"Если бы мы осознанное внедрили \"лазейку\" в наши программы для обеспечения " +"безопасности, нашей профессиональной репутации пришел бы конец." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "Nobody would trust our software ever again - for excellent reasons!" msgstr "" +"Больше никто и никогда не смог бы доверять нашим программам – с полным на то" +" основанием!" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -517,6 +533,8 @@ msgid "" "If we (or the distributors that gave you Tor) don't give you access to the " "source code, that's a sure sign something funny might be going on." msgstr "" +"Если мы (или распространители Tor) перестанем давать вам доступ к исходному " +"коду, это будет весьма тревожный признак." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -578,6 +596,7 @@ msgstr "" #: (content/about/can-i-use-tor-with/contents+en.lrquestion.description) msgid "Please add to this list and help us keep it accurate!" msgstr "" +"Пожалуйста, пополняйте его и помогите нам заботиться о точности данных!" #: https//support.torproject.org/about/can-i-use-tor-with/ #: (content/about/can-i-use-tor-with/contents+en.lrquestion.description) @@ -1025,7 +1044,7 @@ msgstr "Откуда взялось название \"Tor\"?" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Tor is the onion routing network." -msgstr "" +msgstr "Tor – сеть на основе \"луковой маршрутизации\" (The Onion Routing)." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -2463,6 +2482,8 @@ msgid "" "If you'd like to become a relay, please see our [Tor Relay " "Guide](https://community.torproject.org/relay)." msgstr "" +"Если хотите создать узел Tor, обратитесь к нашему [руководству по узлам " +"Tor](https://community.torproject.org/relay)." #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.title) @@ -2737,6 +2758,7 @@ msgid "" "For a while now, Disconnect, which was formerly used in Tor Browser, has had" " no access to Google search results." msgstr "" +"Предыдущий поисковик Disconnect не имел доступа к результатам поиска Google." #: https//support.torproject.org/tbb/tbb-41/ #: (content/tbb/tbb-41/contents+en.lrquestion.description) @@ -2745,6 +2767,9 @@ msgid "" "choose between different search providers, it fell back to delivering Bing " "search results, which were basically unacceptable quality-wise." msgstr "" +"Disconnect – мета-поисковая машина, то есть, давал пользователям выбор между" +" различными поисковыми сервисами. Но он тяготел к поисковым результатам " +"Bing, которые не соответствовали нашим представлениям о качестве." #: https//support.torproject.org/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.title) @@ -7672,7 +7697,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### onion site" -msgstr "" +msgstr "### onion site" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7680,6 +7705,8 @@ msgid "" "An onion site is another name for an [onion service](#onion-services), but " "refers exclusively to websites." msgstr "" +"Сайт onion. Примерно то же, что и [ресурс onion](#onion-services), но только" +" сайт." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7703,7 +7730,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### operating system (OS)" -msgstr "" +msgstr "### operating system (OS)" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7874,6 +7901,9 @@ msgid "" "corresponding [private key](#private-key) is known only by the owner of the " "key pair." msgstr "" +"[Открытый ключ](#public-key) можно распространять сколь угодно широко. " +"Парный ему [секретный ключ](#private-key) находится под исключительным " +"контролем владельца пары ключей." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7945,6 +7975,9 @@ msgid "" "browsers that allows you to download several security and privacy programs, " "including [Tor Browser](#tor-browser), from different sources." msgstr "" +"[Дополнение](#add-on-extension-or-plugin) к браузерам Chrome и Chromium. " +"Позволяет скачивать (из разных источников) ряд программ для обеспечения " +"безопасности и анонимности, включая [Tor Browser](#tor-browser)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7967,6 +8000,8 @@ msgstr "### script" #: (content/misc/glossary/contents+en.lrquestion.description) msgid "Element used for offering dynamic/interactive content via websites." msgstr "" +"Скрипт. Элемент, который используются для придания веб-сайтам " +"динамичности/интерактивности." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8475,7 +8510,7 @@ msgstr "## W" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### web browser" -msgstr "" +msgstr "### web browser" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8484,6 +8519,9 @@ msgid "" "for retrieving, presenting, and browsing information resources on the World " "Wide Web." msgstr "" +"Веб-браузер (или просто браузер). Программа для просмотра и показа " +"информационных ресурсов во \"всемирной паутине\" интернета и навигации по " +"ним." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -9122,6 +9160,8 @@ msgid "" "reason, and because many people end up preferring it anyway, you should also" " consider using an IRC client." msgstr "" +"OFTC часто не позволяет людям использовать веб-чат через сеть Tor. Многие " +"предпочитают IRC-клиент, где нет этой проблемы. Может, и вам попробовать?" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.title) @@ -9487,6 +9527,9 @@ msgid "" "https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" " | gpg --import" msgstr "" +"# wget -qO- " +"https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" +" | gpg --import" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9498,7 +9541,7 @@ msgstr "" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "#### 4. Install tor and the Tor Debian Keyring" -msgstr "" +msgstr "#### 4. Установите Tor и связку ключей Tor Debian" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Jan '20

15 Jan '20

commit 1d2a3749ecfd1e03fcebe1db3a94eeb03325c6eb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 19:53:41 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+ru.po b/contents+ru.po index 30ae34524f..e5051457a2 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -297,6 +297,8 @@ msgid "" "Tor Browser is specifically engineered to have a nearly identical (we're not" " perfect!) fingerprint across its users." msgstr "" +"Tor Browser специально спроектирован так, чтобы у всех его пользователей " +"были почти (да, трудно добиться совершенства) один и тот же отпечаток." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description)

1 0

[community/master] more updates for l10n section.
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit e7672f4557448337624e6de90f36f3e3869b4972 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 15 19:13:01 2020 +0100 more updates for l10n section. closes: https://dip.torproject.org/torproject/web/community/merge_requests/27 --- content/localization/pick-a-project/contents.lr | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/content/localization/pick-a-project/contents.lr b/content/localization/pick-a-project/contents.lr index d5fe0af..c5b5860 100644 --- a/content/localization/pick-a-project/contents.lr +++ b/content/localization/pick-a-project/contents.lr @@ -15,12 +15,13 @@ key: 3 html: two-columns-page.html --- body: -We want our tools to be available and localized for anyone who wants to use them and appreciate your help. To find out where your knowledge may be most helpful, take a look at the translation progress for the Tor ecosystem of tools so far: +We want our tools to be available and localized for anyone who wants to use them, and we appreciate your help doing so. To find out where your knowledge may be most helpful, take a look at the translation progress for the Tor ecosystem of tools so far: <img class="col-lg-6" src="../../static/images/localization/stats.png"> -Although we would value your contribution to any of the projects above, the most critical are Tor Browser, the Tor Browser User Manual, and our Support Portal: +Although we would value your contribution to any of the projects above, our most critical needs are Tor Browser, the Tor Browser User Manual, and our Support Portal: * Tor Browser is translated in many different Transifex resources, but you can see the [Tor Browser total strings translated per language](https://torpat.ch/locales) to see where help is needed. -* The Tor Browser User Manual is a very useful resource for new users that do not speak English, see [Tor Browser User Manual translation statistics](https://torpat.ch/manual-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-port…. -* The Support Portal is also a valuable resource for all Tor users, see [Tor Support Portal translation statistics](https://torpat.ch/support-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-port… +* The Tor Browser User Manual is a very useful resource for new users that do not speak English, see [Tor Browser User Manual translation statistics](https://torpat.ch/manual-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-port… to help. +* The [Support Portal](https://support.torproject.org/) is also a valuable resource for all Tor users, see [Tor Support Portal translation statistics](https://torpat.ch/support-locales) or [translate](https://www.transifex.com/otf/tor-project-support-community-port… to help. +* The [Community Portal](https://community.torproject.org/) is this website, where you can find ways to contribute to Tor. Help us [translate](https://www.transifex.com/otf/tor-project-support-community-port… it.

1 0

[tor/master] Split core/include.am into per-subdirectory include.am files
by nickm＠torproject.org 15 Jan '20

15 Jan '20

commit 73ac1add3f2af813c18b1da5f0082f6112267304 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 13 09:34:17 2020 -0500 Split core/include.am into per-subdirectory include.am files Closes ticket 32137. --- changes/ticket32137 | 4 + scripts/maint/add_c_file.py | 7 +- src/app/config/include.am | 21 ++ src/app/main/include.am | 18 ++ src/core/crypto/include.am | 18 ++ src/core/include.am | 453 +-------------------------------------- src/core/mainloop/include.am | 22 ++ src/core/or/include.am | 98 +++++++++ src/core/proto/include.am | 18 ++ src/feature/api/include.am | 11 + src/feature/client/include.am | 20 ++ src/feature/control/include.am | 39 ++++ src/feature/dirauth/include.am | 51 +++++ src/feature/dircache/include.am | 15 ++ src/feature/dirclient/include.am | 12 ++ src/feature/dircommon/include.am | 16 ++ src/feature/dirparse/include.am | 25 +++ src/feature/hibernate/include.am | 8 + src/feature/hs/include.am | 35 +++ src/feature/hs_common/include.am | 10 + src/feature/keymgt/include.am | 8 + src/feature/nodelist/include.am | 49 +++++ src/feature/relay/include.am | 39 ++++ src/feature/rend/include.am | 22 ++ src/feature/stats/include.am | 12 ++ src/include.am | 37 ++++ 26 files changed, 611 insertions(+), 457 deletions(-) diff --git a/changes/ticket32137 b/changes/ticket32137 new file mode 100644 index 000000000..3b00ddcf2 --- /dev/null +++ b/changes/ticket32137 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Our include.am files are now broken up by subdirectory. Previously, + src/core/include.am covered all of the subdirectories in "core", + "feature", and "app". Closes ticket 32137. diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py index a9a6eb25b..9ec182efc 100755 --- a/scripts/maint/add_c_file.py +++ b/scripts/maint/add_c_file.py @@ -192,12 +192,9 @@ def get_include_am_location(fname): not (yet) consistent. """ td = topdir_file(fname) - m = re.match(r'^lib/([a-z0-9_]*)/', td) + m = re.match(r'^(lib|core|feature|app)/([a-z0-9_]*)/', td) if m: - return "src/lib/{}/include.am".format(m.group(1)) - - if re.match(r'^(core|feature|app)/', td): - return "src/core/include.am" + return "src/{}/{}/include.am".format(m.group(1),m.group(2)) if re.match(r'^test/', td): return "src/test/include.am" diff --git a/src/app/config/include.am b/src/app/config/include.am new file mode 100644 index 000000000..5d625efec --- /dev/null +++ b/src/app/config/include.am @@ -0,0 +1,21 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/app/config/config.c \ + src/app/config/quiet_level.c \ + src/app/config/statefile.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/app/config/config.h \ + src/app/config/or_options_st.h \ + src/app/config/or_state_st.h \ + src/app/config/quiet_level.h \ + src/app/config/statefile.h \ + src/app/config/tor_cmdline_mode.h + + +noinst_HEADERS += \ + src/app/config/auth_dirs.inc \ + src/app/config/fallback_dirs.inc \ + src/app/config/testnet.inc diff --git a/src/app/main/include.am b/src/app/main/include.am new file mode 100644 index 000000000..ea392a858 --- /dev/null +++ b/src/app/main/include.am @@ -0,0 +1,18 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/app/main/main.c \ + src/app/main/shutdown.c \ + src/app/main/subsystem_list.c \ + src/app/main/subsysmgr.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/app/main/main.h \ + src/app/main/ntmain.h \ + src/app/main/shutdown.h \ + src/app/main/subsysmgr.h + +if BUILD_NT_SERVICES +LIBTOR_APP_A_SOURCES += src/app/main/ntmain.c +endif diff --git a/src/core/crypto/include.am b/src/core/crypto/include.am new file mode 100644 index 000000000..28b7e2290 --- /dev/null +++ b/src/core/crypto/include.am @@ -0,0 +1,18 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/core/crypto/hs_ntor.c \ + src/core/crypto/onion_crypto.c \ + src/core/crypto/onion_fast.c \ + src/core/crypto/onion_ntor.c \ + src/core/crypto/onion_tap.c \ + src/core/crypto/relay_crypto.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/core/crypto/hs_ntor.h \ + src/core/crypto/onion_crypto.h \ + src/core/crypto/onion_fast.h \ + src/core/crypto/onion_ntor.h \ + src/core/crypto/onion_tap.h \ + src/core/crypto/relay_crypto.h diff --git a/src/core/include.am b/src/core/include.am index bd36d01f2..41347ed64 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -1,172 +1,4 @@ -noinst_LIBRARIES += \ - src/core/libtor-app.a -if UNITTESTS_ENABLED -noinst_LIBRARIES += \ - src/core/libtor-app-testing.a -endif - -# ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES = \ - src/app/config/config.c \ - src/app/config/quiet_level.c \ - src/app/config/statefile.c \ - src/app/main/main.c \ - src/app/main/shutdown.c \ - src/app/main/subsystem_list.c \ - src/app/main/subsysmgr.c \ - src/core/crypto/hs_ntor.c \ - src/core/crypto/onion_crypto.c \ - src/core/crypto/onion_fast.c \ - src/core/crypto/onion_ntor.c \ - src/core/crypto/onion_tap.c \ - src/core/crypto/relay_crypto.c \ - src/core/mainloop/connection.c \ - src/core/mainloop/cpuworker.c \ - src/core/mainloop/mainloop.c \ - src/core/mainloop/mainloop_pubsub.c \ - src/core/mainloop/mainloop_sys.c \ - src/core/mainloop/netstatus.c \ - src/core/mainloop/periodic.c \ - src/core/or/address_set.c \ - src/core/or/channel.c \ - src/core/or/channelpadding.c \ - src/core/or/channeltls.c \ - src/core/or/circuitbuild.c \ - src/core/or/circuitlist.c \ - src/core/or/circuitmux.c \ - src/core/or/circuitmux_ewma.c \ - src/core/or/circuitpadding.c \ - src/core/or/circuitpadding_machines.c \ - src/core/or/circuitstats.c \ - src/core/or/circuituse.c \ - src/core/or/crypt_path.c \ - src/core/or/command.c \ - src/core/or/connection_edge.c \ - src/core/or/connection_or.c \ - src/core/or/dos.c \ - src/core/or/onion.c \ - src/core/or/ocirc_event.c \ - src/core/or/or_periodic.c \ - src/core/or/or_sys.c \ - src/core/or/orconn_event.c \ - src/core/or/policies.c \ - src/core/or/protover.c \ - src/core/or/protover_rust.c \ - src/core/or/reasons.c \ - src/core/or/relay.c \ - src/core/or/scheduler.c \ - src/core/or/scheduler_kist.c \ - src/core/or/scheduler_vanilla.c \ - src/core/or/sendme.c \ - src/core/or/status.c \ - src/core/or/versions.c \ - src/core/proto/proto_cell.c \ - src/core/proto/proto_control0.c \ - src/core/proto/proto_ext_or.c \ - src/core/proto/proto_haproxy.c \ - src/core/proto/proto_http.c \ - src/core/proto/proto_socks.c \ - src/feature/api/tor_api.c \ - src/feature/client/addressmap.c \ - src/feature/client/bridges.c \ - src/feature/client/circpathbias.c \ - src/feature/client/dnsserv.c \ - src/feature/client/entrynodes.c \ - src/feature/client/proxymode.c \ - src/feature/client/transports.c \ - src/feature/control/btrack.c \ - src/feature/control/btrack_circuit.c \ - src/feature/control/btrack_orconn.c \ - src/feature/control/btrack_orconn_cevent.c \ - src/feature/control/btrack_orconn_maps.c \ - src/feature/control/control.c \ - src/feature/control/control_auth.c \ - src/feature/control/control_bootstrap.c \ - src/feature/control/control_cmd.c \ - src/feature/control/control_hs.c \ - src/feature/control/control_events.c \ - src/feature/control/control_fmt.c \ - src/feature/control/control_getinfo.c \ - src/feature/control/control_proto.c \ - src/feature/control/fmt_serverstatus.c \ - src/feature/control/getinfo_geoip.c \ - src/feature/dircache/conscache.c \ - src/feature/dircache/consdiffmgr.c \ - src/feature/dircache/dircache.c \ - src/feature/dircache/dirserv.c \ - src/feature/dirclient/dirclient.c \ - src/feature/dirclient/dlstatus.c \ - src/feature/dircommon/consdiff.c \ - src/feature/dircommon/directory.c \ - src/feature/dircommon/fp_pair.c \ - src/feature/dircommon/voting_schedule.c \ - src/feature/dirparse/authcert_parse.c \ - src/feature/dirparse/microdesc_parse.c \ - src/feature/dirparse/ns_parse.c \ - src/feature/dirparse/parsecommon.c \ - src/feature/dirparse/policy_parse.c \ - src/feature/dirparse/routerparse.c \ - src/feature/dirparse/sigcommon.c \ - src/feature/dirparse/signing.c \ - src/feature/dirparse/unparseable.c \ - src/feature/hibernate/hibernate.c \ - src/feature/hs/hs_cache.c \ - src/feature/hs/hs_cell.c \ - src/feature/hs/hs_circuit.c \ - src/feature/hs/hs_circuitmap.c \ - src/feature/hs/hs_client.c \ - src/feature/hs/hs_common.c \ - src/feature/hs/hs_config.c \ - src/feature/hs/hs_control.c \ - src/feature/hs/hs_descriptor.c \ - src/feature/hs/hs_dos.c \ - src/feature/hs/hs_ident.c \ - src/feature/hs/hs_intropoint.c \ - src/feature/hs/hs_service.c \ - src/feature/hs/hs_stats.c \ - src/feature/hs_common/replaycache.c \ - src/feature/hs_common/shared_random_client.c \ - src/feature/keymgt/loadkey.c \ - src/feature/nodelist/authcert.c \ - src/feature/nodelist/describe.c \ - src/feature/nodelist/dirlist.c \ - src/feature/nodelist/microdesc.c \ - src/feature/nodelist/networkstatus.c \ - src/feature/nodelist/nickname.c \ - src/feature/nodelist/nodefamily.c \ - src/feature/nodelist/nodelist.c \ - src/feature/nodelist/node_select.c \ - src/feature/nodelist/routerinfo.c \ - src/feature/nodelist/routerlist.c \ - src/feature/nodelist/routerset.c \ - src/feature/nodelist/fmt_routerstatus.c \ - src/feature/nodelist/torcert.c \ - src/feature/relay/dns.c \ - src/feature/relay/ext_orport.c \ - src/feature/relay/onion_queue.c \ - src/feature/relay/router.c \ - src/feature/relay/routerkeys.c \ - src/feature/relay/selftest.c \ - src/feature/rend/rendcache.c \ - src/feature/rend/rendclient.c \ - src/feature/rend/rendcommon.c \ - src/feature/rend/rendmid.c \ - src/feature/rend/rendparse.c \ - src/feature/rend/rendservice.c \ - src/feature/stats/geoip_stats.c \ - src/feature/stats/rephist.c \ - src/feature/stats/predict_ports.c - -# -# Sources that we only add for the real libtor_a, and not for testing. -# -LIBTOR_APP_A_STUB_SOURCES = - -if BUILD_NT_SERVICES -LIBTOR_APP_A_SOURCES += src/app/main/ntmain.c -endif - # # Modules are conditionally compiled in tor starting here. We add the C files # only if the modules has been enabled at configure time. We always add the @@ -175,49 +7,11 @@ endif # LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) -# The Relay module. -MODULE_RELAY_SOURCES = \ - src/feature/relay/routermode.c \ - src/feature/relay/relay_config.c \ - src/feature/relay/relay_periodic.c \ - src/feature/relay/relay_sys.c \ - src/feature/relay/transport_config.c - -# The Directory Authority module. -MODULE_DIRAUTH_SOURCES = \ - src/feature/dirauth/authmode.c \ - src/feature/dirauth/bridgeauth.c \ - src/feature/dirauth/bwauth.c \ - src/feature/dirauth/dirauth_config.c \ - src/feature/dirauth/dirauth_periodic.c \ - src/feature/dirauth/dirauth_sys.c \ - src/feature/dirauth/dircollate.c \ - src/feature/dirauth/dirvote.c \ - src/feature/dirauth/dsigs_parse.c \ - src/feature/dirauth/guardfraction.c \ - src/feature/dirauth/keypin.c \ - src/feature/dirauth/process_descs.c \ - src/feature/dirauth/reachability.c \ - src/feature/dirauth/recommend_pkg.c \ - src/feature/dirauth/shared_random.c \ - src/feature/dirauth/shared_random_state.c \ - src/feature/dirauth/voteflags.c - -if BUILD_MODULE_RELAY -LIBTOR_APP_A_SOURCES += $(MODULE_RELAY_SOURCES) -else -LIBTOR_APP_A_STUB_SOURCES += src/feature/relay/relay_stub.c -endif - -if BUILD_MODULE_DIRAUTH -LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) -else -LIBTOR_APP_A_STUB_SOURCES += src/feature/dirauth/dirauth_stub.c -endif src_core_libtor_app_a_SOURCES = \ $(LIBTOR_APP_A_SOURCES) \ $(LIBTOR_APP_A_STUB_SOURCES) + if UNITTESTS_ENABLED # Add the sources of the modules that are needed for tests to work here. @@ -236,251 +30,6 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ src_core_libtor_app_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_core_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -# ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ - src/app/config/config.h \ - src/app/config/or_options_st.h \ - src/app/config/or_state_st.h \ - src/app/config/quiet_level.h \ - src/app/config/statefile.h \ - src/app/config/tor_cmdline_mode.h \ - src/app/main/main.h \ - src/app/main/ntmain.h \ - src/app/main/shutdown.h \ - src/app/main/subsysmgr.h \ - src/core/crypto/hs_ntor.h \ - src/core/crypto/onion_crypto.h \ - src/core/crypto/onion_fast.h \ - src/core/crypto/onion_ntor.h \ - src/core/crypto/onion_tap.h \ - src/core/crypto/relay_crypto.h \ - src/core/mainloop/connection.h \ - src/core/mainloop/cpuworker.h \ - src/core/mainloop/mainloop.h \ - src/core/mainloop/mainloop_pubsub.h \ - src/core/mainloop/mainloop_state.inc \ - src/core/mainloop/mainloop_state_st.h \ - src/core/mainloop/mainloop_sys.h \ - src/core/mainloop/netstatus.h \ - src/core/mainloop/periodic.h \ - src/core/or/addr_policy_st.h \ - src/core/or/address_set.h \ - src/core/or/cell_queue_st.h \ - src/core/or/cell_st.h \ - src/core/or/channel.h \ - src/core/or/channelpadding.h \ - src/core/or/channeltls.h \ - src/core/or/circuit_st.h \ - src/core/or/circuitbuild.h \ - src/core/or/circuitlist.h \ - src/core/or/circuitmux.h \ - src/core/or/circuitmux_ewma.h \ - src/core/or/circuitstats.h \ - src/core/or/circuitpadding.h \ - src/core/or/circuitpadding_machines.h \ - src/core/or/circuituse.h \ - src/core/or/command.h \ - src/core/or/connection_edge.h \ - src/core/or/connection_or.h \ - src/core/or/connection_st.h \ - src/core/or/crypt_path.h \ - src/core/or/cpath_build_state_st.h \ - src/core/or/crypt_path_reference_st.h \ - src/core/or/crypt_path_st.h \ - src/core/or/destroy_cell_queue_st.h \ - src/core/or/dos.h \ - src/core/or/edge_connection_st.h \ - src/core/or/half_edge_st.h \ - src/core/or/entry_connection_st.h \ - src/core/or/entry_port_cfg_st.h \ - src/core/or/extend_info_st.h \ - src/core/or/listener_connection_st.h \ - src/core/or/onion.h \ - src/core/or/or.h \ - src/core/or/or_periodic.h \ - src/core/or/or_sys.h \ - src/core/or/orconn_event.h \ - src/core/or/orconn_event_sys.h \ - src/core/or/or_circuit_st.h \ - src/core/or/or_connection_st.h \ - src/core/or/or_handshake_certs_st.h \ - src/core/or/or_handshake_state_st.h \ - src/core/or/ocirc_event.h \ - src/core/or/ocirc_event_sys.h \ - src/core/or/origin_circuit_st.h \ - src/core/or/policies.h \ - src/core/or/port_cfg_st.h \ - src/core/or/protover.h \ - src/core/or/reasons.h \ - src/core/or/relay.h \ - src/core/or/relay_crypto_st.h \ - src/core/or/scheduler.h \ - src/core/or/sendme.h \ - src/core/or/server_port_cfg_st.h \ - src/core/or/socks_request_st.h \ - src/core/or/status.h \ - src/core/or/tor_version_st.h \ - src/core/or/var_cell_st.h \ - src/core/or/versions.h \ - src/core/proto/proto_cell.h \ - src/core/proto/proto_control0.h \ - src/core/proto/proto_ext_or.h \ - src/core/proto/proto_haproxy.h \ - src/core/proto/proto_http.h \ - src/core/proto/proto_socks.h \ - src/feature/api/tor_api_internal.h \ - src/feature/client/addressmap.h \ - src/feature/client/bridges.h \ - src/feature/client/circpathbias.h \ - src/feature/client/dnsserv.h \ - src/feature/client/entrynodes.h \ - src/feature/client/proxymode.h \ - src/feature/client/transports.h \ - src/feature/control/btrack_circuit.h \ - src/feature/control/btrack_orconn.h \ - src/feature/control/btrack_orconn_cevent.h \ - src/feature/control/btrack_orconn_maps.h \ - src/feature/control/btrack_sys.h \ - src/feature/control/control.h \ - src/feature/control/control_auth.h \ - src/feature/control/control_cmd.h \ - src/feature/control/control_hs.h \ - src/feature/control/control_cmd_args_st.h \ - src/feature/control/control_connection_st.h \ - src/feature/control/control_events.h \ - src/feature/control/control_fmt.h \ - src/feature/control/control_getinfo.h \ - src/feature/control/control_proto.h \ - src/feature/control/fmt_serverstatus.h \ - src/feature/control/getinfo_geoip.h \ - src/feature/dirauth/authmode.h \ - src/feature/dirauth/bridgeauth.h \ - src/feature/dirauth/bwauth.h \ - src/feature/dirauth/dirauth_config.h \ - src/feature/dirauth/dirauth_options.inc \ - src/feature/dirauth/dirauth_options_st.h \ - src/feature/dirauth/dirauth_periodic.h \ - src/feature/dirauth/dirauth_sys.h \ - src/feature/dirauth/dircollate.h \ - src/feature/dirauth/dirvote.h \ - src/feature/dirauth/dsigs_parse.h \ - src/feature/dirauth/guardfraction.h \ - src/feature/dirauth/keypin.h \ - src/feature/dirauth/ns_detached_signatures_st.h \ - src/feature/dirauth/reachability.h \ - src/feature/dirauth/recommend_pkg.h \ - src/feature/dirauth/process_descs.h \ - src/feature/dirauth/shared_random.h \ - src/feature/dirauth/shared_random_state.h \ - src/feature/dirauth/vote_microdesc_hash_st.h \ - src/feature/dirauth/voteflags.h \ - src/feature/dircache/cached_dir_st.h \ - src/feature/dircache/conscache.h \ - src/feature/dircache/consdiffmgr.h \ - src/feature/dircache/dircache.h \ - src/feature/dircache/dirserv.h \ - src/feature/dirclient/dir_server_st.h \ - src/feature/dirclient/dirclient.h \ - src/feature/dirclient/dlstatus.h \ - src/feature/dirclient/download_status_st.h \ - src/feature/dircommon/consdiff.h \ - src/feature/dircommon/dir_connection_st.h \ - src/feature/dircommon/directory.h \ - src/feature/dircommon/fp_pair.h \ - src/feature/dircommon/vote_timing_st.h \ - src/feature/dircommon/voting_schedule.h \ - src/feature/dirparse/authcert_members.h \ - src/feature/dirparse/authcert_parse.h \ - src/feature/dirparse/microdesc_parse.h \ - src/feature/dirparse/ns_parse.h \ - src/feature/dirparse/parsecommon.h \ - src/feature/dirparse/policy_parse.h \ - src/feature/dirparse/routerparse.h \ - src/feature/dirparse/sigcommon.h \ - src/feature/dirparse/signing.h \ - src/feature/dirparse/unparseable.h \ - src/feature/hibernate/hibernate.h \ - src/feature/hs/hs_cache.h \ - src/feature/hs/hs_cell.h \ - src/feature/hs/hs_circuit.h \ - src/feature/hs/hs_circuitmap.h \ - src/feature/hs/hs_client.h \ - src/feature/hs/hs_common.h \ - src/feature/hs/hs_config.h \ - src/feature/hs/hs_control.h \ - src/feature/hs/hs_descriptor.h \ - src/feature/hs/hs_dos.h \ - src/feature/hs/hs_ident.h \ - src/feature/hs/hs_intropoint.h \ - src/feature/hs/hs_service.h \ - src/feature/hs/hs_stats.h \ - src/feature/hs/hsdir_index_st.h \ - src/feature/hs_common/replaycache.h \ - src/feature/hs_common/shared_random_client.h \ - src/feature/keymgt/loadkey.h \ - src/feature/nodelist/authcert.h \ - src/feature/nodelist/authority_cert_st.h \ - src/feature/nodelist/describe.h \ - src/feature/nodelist/desc_store_st.h \ - src/feature/nodelist/dirlist.h \ - src/feature/nodelist/document_signature_st.h \ - src/feature/nodelist/extrainfo_st.h \ - src/feature/nodelist/microdesc.h \ - src/feature/nodelist/microdesc_st.h \ - src/feature/nodelist/networkstatus.h \ - src/feature/nodelist/networkstatus_sr_info_st.h \ - src/feature/nodelist/networkstatus_st.h \ - src/feature/nodelist/networkstatus_voter_info_st.h \ - src/feature/nodelist/nickname.h \ - src/feature/nodelist/node_st.h \ - src/feature/nodelist/nodefamily.h \ - src/feature/nodelist/nodefamily_st.h \ - src/feature/nodelist/nodelist.h \ - src/feature/nodelist/node_select.h \ - src/feature/nodelist/routerinfo.h \ - src/feature/nodelist/routerinfo_st.h \ - src/feature/nodelist/routerlist.h \ - src/feature/nodelist/routerlist_st.h \ - src/feature/nodelist/routerset.h \ - src/feature/nodelist/fmt_routerstatus.h \ - src/feature/nodelist/routerstatus_st.h \ - src/feature/nodelist/signed_descriptor_st.h \ - src/feature/nodelist/torcert.h \ - src/feature/nodelist/vote_routerstatus_st.h \ - src/feature/relay/dns.h \ - src/feature/relay/dns_structs.h \ - src/feature/relay/ext_orport.h \ - src/feature/relay/onion_queue.h \ - src/feature/relay/relay_config.h \ - src/feature/relay/relay_periodic.h \ - src/feature/relay/relay_sys.h \ - src/feature/relay/router.h \ - src/feature/relay/routerkeys.h \ - src/feature/relay/routermode.h \ - src/feature/relay/selftest.h \ - src/feature/relay/transport_config.h \ - src/feature/rend/rend_authorized_client_st.h \ - src/feature/rend/rend_encoded_v2_service_descriptor_st.h \ - src/feature/rend/rend_intro_point_st.h \ - src/feature/rend/rend_service_descriptor_st.h \ - src/feature/rend/rendcache.h \ - src/feature/rend/rendclient.h \ - src/feature/rend/rendcommon.h \ - src/feature/rend/rendmid.h \ - src/feature/rend/rendparse.h \ - src/feature/rend/rendservice.h \ - src/feature/stats/geoip_stats.h \ - src/feature/stats/rephist.h \ - src/feature/stats/predict_ports.h - -noinst_HEADERS += \ - src/app/config/auth_dirs.inc \ - src/app/config/fallback_dirs.inc \ - src/app/config/testnet.inc - -# This may someday want to be an installed file? -noinst_HEADERS += src/feature/api/tor_api.h - micro-revision.i: FORCE $(AM_V_at)rm -f micro-revision.tmp; \ if test -r "$(top_srcdir)/.git" && \ diff --git a/src/core/mainloop/include.am b/src/core/mainloop/include.am new file mode 100644 index 000000000..63643127f --- /dev/null +++ b/src/core/mainloop/include.am @@ -0,0 +1,22 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/core/mainloop/connection.c \ + src/core/mainloop/cpuworker.c \ + src/core/mainloop/mainloop.c \ + src/core/mainloop/mainloop_pubsub.c \ + src/core/mainloop/mainloop_sys.c \ + src/core/mainloop/netstatus.c \ + src/core/mainloop/periodic.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/core/mainloop/connection.h \ + src/core/mainloop/cpuworker.h \ + src/core/mainloop/mainloop.h \ + src/core/mainloop/mainloop_pubsub.h \ + src/core/mainloop/mainloop_state.inc \ + src/core/mainloop/mainloop_state_st.h \ + src/core/mainloop/mainloop_sys.h \ + src/core/mainloop/netstatus.h \ + src/core/mainloop/periodic.h diff --git a/src/core/or/include.am b/src/core/or/include.am new file mode 100644 index 000000000..4dd251d2e --- /dev/null +++ b/src/core/or/include.am @@ -0,0 +1,98 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/core/or/address_set.c \ + src/core/or/channel.c \ + src/core/or/channelpadding.c \ + src/core/or/channeltls.c \ + src/core/or/circuitbuild.c \ + src/core/or/circuitlist.c \ + src/core/or/circuitmux.c \ + src/core/or/circuitmux_ewma.c \ + src/core/or/circuitpadding.c \ + src/core/or/circuitpadding_machines.c \ + src/core/or/circuitstats.c \ + src/core/or/circuituse.c \ + src/core/or/crypt_path.c \ + src/core/or/command.c \ + src/core/or/connection_edge.c \ + src/core/or/connection_or.c \ + src/core/or/dos.c \ + src/core/or/onion.c \ + src/core/or/ocirc_event.c \ + src/core/or/or_periodic.c \ + src/core/or/or_sys.c \ + src/core/or/orconn_event.c \ + src/core/or/policies.c \ + src/core/or/protover.c \ + src/core/or/protover_rust.c \ + src/core/or/reasons.c \ + src/core/or/relay.c \ + src/core/or/scheduler.c \ + src/core/or/scheduler_kist.c \ + src/core/or/scheduler_vanilla.c \ + src/core/or/sendme.c \ + src/core/or/status.c \ + src/core/or/versions.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/core/or/addr_policy_st.h \ + src/core/or/address_set.h \ + src/core/or/cell_queue_st.h \ + src/core/or/cell_st.h \ + src/core/or/channel.h \ + src/core/or/channelpadding.h \ + src/core/or/channeltls.h \ + src/core/or/circuit_st.h \ + src/core/or/circuitbuild.h \ + src/core/or/circuitlist.h \ + src/core/or/circuitmux.h \ + src/core/or/circuitmux_ewma.h \ + src/core/or/circuitstats.h \ + src/core/or/circuitpadding.h \ + src/core/or/circuitpadding_machines.h \ + src/core/or/circuituse.h \ + src/core/or/command.h \ + src/core/or/connection_edge.h \ + src/core/or/connection_or.h \ + src/core/or/connection_st.h \ + src/core/or/crypt_path.h \ + src/core/or/cpath_build_state_st.h \ + src/core/or/crypt_path_reference_st.h \ + src/core/or/crypt_path_st.h \ + src/core/or/destroy_cell_queue_st.h \ + src/core/or/dos.h \ + src/core/or/edge_connection_st.h \ + src/core/or/half_edge_st.h \ + src/core/or/entry_connection_st.h \ + src/core/or/entry_port_cfg_st.h \ + src/core/or/extend_info_st.h \ + src/core/or/listener_connection_st.h \ + src/core/or/onion.h \ + src/core/or/or.h \ + src/core/or/or_periodic.h \ + src/core/or/or_sys.h \ + src/core/or/orconn_event.h \ + src/core/or/orconn_event_sys.h \ + src/core/or/or_circuit_st.h \ + src/core/or/or_connection_st.h \ + src/core/or/or_handshake_certs_st.h \ + src/core/or/or_handshake_state_st.h \ + src/core/or/ocirc_event.h \ + src/core/or/ocirc_event_sys.h \ + src/core/or/origin_circuit_st.h \ + src/core/or/policies.h \ + src/core/or/port_cfg_st.h \ + src/core/or/protover.h \ + src/core/or/reasons.h \ + src/core/or/relay.h \ + src/core/or/relay_crypto_st.h \ + src/core/or/scheduler.h \ + src/core/or/sendme.h \ + src/core/or/server_port_cfg_st.h \ + src/core/or/socks_request_st.h \ + src/core/or/status.h \ + src/core/or/tor_version_st.h \ + src/core/or/var_cell_st.h \ + src/core/or/versions.h diff --git a/src/core/proto/include.am b/src/core/proto/include.am new file mode 100644 index 000000000..726ef924c --- /dev/null +++ b/src/core/proto/include.am @@ -0,0 +1,18 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/core/proto/proto_cell.c \ + src/core/proto/proto_control0.c \ + src/core/proto/proto_ext_or.c \ + src/core/proto/proto_haproxy.c \ + src/core/proto/proto_http.c \ + src/core/proto/proto_socks.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/core/proto/proto_cell.h \ + src/core/proto/proto_control0.h \ + src/core/proto/proto_ext_or.h \ + src/core/proto/proto_haproxy.h \ + src/core/proto/proto_http.h \ + src/core/proto/proto_socks.h diff --git a/src/feature/api/include.am b/src/feature/api/include.am new file mode 100644 index 000000000..8d490458d --- /dev/null +++ b/src/feature/api/include.am @@ -0,0 +1,11 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/api/tor_api.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/api/tor_api_internal.h + +# This may someday want to be an installed file? +noinst_HEADERS += src/feature/api/tor_api.h diff --git a/src/feature/client/include.am b/src/feature/client/include.am new file mode 100644 index 000000000..53c9f047d --- /dev/null +++ b/src/feature/client/include.am @@ -0,0 +1,20 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/client/addressmap.c \ + src/feature/client/bridges.c \ + src/feature/client/circpathbias.c \ + src/feature/client/dnsserv.c \ + src/feature/client/entrynodes.c \ + src/feature/client/proxymode.c \ + src/feature/client/transports.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/client/addressmap.h \ + src/feature/client/bridges.h \ + src/feature/client/circpathbias.h \ + src/feature/client/dnsserv.h \ + src/feature/client/entrynodes.h \ + src/feature/client/proxymode.h \ + src/feature/client/transports.h diff --git a/src/feature/control/include.am b/src/feature/control/include.am new file mode 100644 index 000000000..07094f23b --- /dev/null +++ b/src/feature/control/include.am @@ -0,0 +1,39 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/control/btrack.c \ + src/feature/control/btrack_circuit.c \ + src/feature/control/btrack_orconn.c \ + src/feature/control/btrack_orconn_cevent.c \ + src/feature/control/btrack_orconn_maps.c \ + src/feature/control/control.c \ + src/feature/control/control_auth.c \ + src/feature/control/control_bootstrap.c \ + src/feature/control/control_cmd.c \ + src/feature/control/control_hs.c \ + src/feature/control/control_events.c \ + src/feature/control/control_fmt.c \ + src/feature/control/control_getinfo.c \ + src/feature/control/control_proto.c \ + src/feature/control/fmt_serverstatus.c \ + src/feature/control/getinfo_geoip.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/control/btrack_circuit.h \ + src/feature/control/btrack_orconn.h \ + src/feature/control/btrack_orconn_cevent.h \ + src/feature/control/btrack_orconn_maps.h \ + src/feature/control/btrack_sys.h \ + src/feature/control/control.h \ + src/feature/control/control_auth.h \ + src/feature/control/control_cmd.h \ + src/feature/control/control_hs.h \ + src/feature/control/control_cmd_args_st.h \ + src/feature/control/control_connection_st.h \ + src/feature/control/control_events.h \ + src/feature/control/control_fmt.h \ + src/feature/control/control_getinfo.h \ + src/feature/control/control_proto.h \ + src/feature/control/fmt_serverstatus.h \ + src/feature/control/getinfo_geoip.h diff --git a/src/feature/dirauth/include.am b/src/feature/dirauth/include.am new file mode 100644 index 000000000..ec7b3b296 --- /dev/null +++ b/src/feature/dirauth/include.am @@ -0,0 +1,51 @@ + +# The Directory Authority module. +# ADD_C_FILE: INSERT SOURCES HERE. +MODULE_DIRAUTH_SOURCES = \ + src/feature/dirauth/authmode.c \ + src/feature/dirauth/bridgeauth.c \ + src/feature/dirauth/bwauth.c \ + src/feature/dirauth/dirauth_config.c \ + src/feature/dirauth/dirauth_periodic.c \ + src/feature/dirauth/dirauth_sys.c \ + src/feature/dirauth/dircollate.c \ + src/feature/dirauth/dirvote.c \ + src/feature/dirauth/dsigs_parse.c \ + src/feature/dirauth/guardfraction.c \ + src/feature/dirauth/keypin.c \ + src/feature/dirauth/process_descs.c \ + src/feature/dirauth/reachability.c \ + src/feature/dirauth/recommend_pkg.c \ + src/feature/dirauth/shared_random.c \ + src/feature/dirauth/shared_random_state.c \ + src/feature/dirauth/voteflags.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/dirauth/authmode.h \ + src/feature/dirauth/bridgeauth.h \ + src/feature/dirauth/bwauth.h \ + src/feature/dirauth/dirauth_config.h \ + src/feature/dirauth/dirauth_options.inc \ + src/feature/dirauth/dirauth_options_st.h \ + src/feature/dirauth/dirauth_periodic.h \ + src/feature/dirauth/dirauth_sys.h \ + src/feature/dirauth/dircollate.h \ + src/feature/dirauth/dirvote.h \ + src/feature/dirauth/dsigs_parse.h \ + src/feature/dirauth/guardfraction.h \ + src/feature/dirauth/keypin.h \ + src/feature/dirauth/ns_detached_signatures_st.h \ + src/feature/dirauth/reachability.h \ + src/feature/dirauth/recommend_pkg.h \ + src/feature/dirauth/process_descs.h \ + src/feature/dirauth/shared_random.h \ + src/feature/dirauth/shared_random_state.h \ + src/feature/dirauth/vote_microdesc_hash_st.h \ + src/feature/dirauth/voteflags.h + +if BUILD_MODULE_DIRAUTH +LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) +else +LIBTOR_APP_A_STUB_SOURCES += src/feature/dirauth/dirauth_stub.c +endif diff --git a/src/feature/dircache/include.am b/src/feature/dircache/include.am new file mode 100644 index 000000000..3ff54ad64 --- /dev/null +++ b/src/feature/dircache/include.am @@ -0,0 +1,15 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/dircache/conscache.c \ + src/feature/dircache/consdiffmgr.c \ + src/feature/dircache/dircache.c \ + src/feature/dircache/dirserv.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/dircache/cached_dir_st.h \ + src/feature/dircache/conscache.h \ + src/feature/dircache/consdiffmgr.h \ + src/feature/dircache/dircache.h \ + src/feature/dircache/dirserv.h diff --git a/src/feature/dirclient/include.am b/src/feature/dirclient/include.am new file mode 100644 index 000000000..7e7259bc5 --- /dev/null +++ b/src/feature/dirclient/include.am @@ -0,0 +1,12 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/dirclient/dirclient.c \ + src/feature/dirclient/dlstatus.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/dirclient/dir_server_st.h \ + src/feature/dirclient/dirclient.h \ + src/feature/dirclient/dlstatus.h \ + src/feature/dirclient/download_status_st.h diff --git a/src/feature/dircommon/include.am b/src/feature/dircommon/include.am new file mode 100644 index 000000000..f0f0323d1 --- /dev/null +++ b/src/feature/dircommon/include.am @@ -0,0 +1,16 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/dircommon/consdiff.c \ + src/feature/dircommon/directory.c \ + src/feature/dircommon/fp_pair.c \ + src/feature/dircommon/voting_schedule.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/dircommon/consdiff.h \ + src/feature/dircommon/dir_connection_st.h \ + src/feature/dircommon/directory.h \ + src/feature/dircommon/fp_pair.h \ + src/feature/dircommon/vote_timing_st.h \ + src/feature/dircommon/voting_schedule.h diff --git a/src/feature/dirparse/include.am b/src/feature/dirparse/include.am new file mode 100644 index 000000000..edca04f6f --- /dev/null +++ b/src/feature/dirparse/include.am @@ -0,0 +1,25 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/dirparse/authcert_parse.c \ + src/feature/dirparse/microdesc_parse.c \ + src/feature/dirparse/ns_parse.c \ + src/feature/dirparse/parsecommon.c \ + src/feature/dirparse/policy_parse.c \ + src/feature/dirparse/routerparse.c \ + src/feature/dirparse/sigcommon.c \ + src/feature/dirparse/signing.c \ + src/feature/dirparse/unparseable.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/dirparse/authcert_members.h \ + src/feature/dirparse/authcert_parse.h \ + src/feature/dirparse/microdesc_parse.h \ + src/feature/dirparse/ns_parse.h \ + src/feature/dirparse/parsecommon.h \ + src/feature/dirparse/policy_parse.h \ + src/feature/dirparse/routerparse.h \ + src/feature/dirparse/sigcommon.h \ + src/feature/dirparse/signing.h \ + src/feature/dirparse/unparseable.h diff --git a/src/feature/hibernate/include.am b/src/feature/hibernate/include.am new file mode 100644 index 000000000..355e59139 --- /dev/null +++ b/src/feature/hibernate/include.am @@ -0,0 +1,8 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/hibernate/hibernate.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/hibernate/hibernate.h diff --git a/src/feature/hs/include.am b/src/feature/hs/include.am new file mode 100644 index 000000000..5e69607e5 --- /dev/null +++ b/src/feature/hs/include.am @@ -0,0 +1,35 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/hs/hs_cache.c \ + src/feature/hs/hs_cell.c \ + src/feature/hs/hs_circuit.c \ + src/feature/hs/hs_circuitmap.c \ + src/feature/hs/hs_client.c \ + src/feature/hs/hs_common.c \ + src/feature/hs/hs_config.c \ + src/feature/hs/hs_control.c \ + src/feature/hs/hs_descriptor.c \ + src/feature/hs/hs_dos.c \ + src/feature/hs/hs_ident.c \ + src/feature/hs/hs_intropoint.c \ + src/feature/hs/hs_service.c \ + src/feature/hs/hs_stats.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/hs/hs_cache.h \ + src/feature/hs/hs_cell.h \ + src/feature/hs/hs_circuit.h \ + src/feature/hs/hs_circuitmap.h \ + src/feature/hs/hs_client.h \ + src/feature/hs/hs_common.h \ + src/feature/hs/hs_config.h \ + src/feature/hs/hs_control.h \ + src/feature/hs/hs_descriptor.h \ + src/feature/hs/hs_dos.h \ + src/feature/hs/hs_ident.h \ + src/feature/hs/hs_intropoint.h \ + src/feature/hs/hs_service.h \ + src/feature/hs/hs_stats.h \ + src/feature/hs/hsdir_index_st.h diff --git a/src/feature/hs_common/include.am b/src/feature/hs_common/include.am new file mode 100644 index 000000000..3bb9225c1 --- /dev/null +++ b/src/feature/hs_common/include.am @@ -0,0 +1,10 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/hs_common/replaycache.c \ + src/feature/hs_common/shared_random_client.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/hs_common/replaycache.h \ + src/feature/hs_common/shared_random_client.h diff --git a/src/feature/keymgt/include.am b/src/feature/keymgt/include.am new file mode 100644 index 000000000..bc9beaa52 --- /dev/null +++ b/src/feature/keymgt/include.am @@ -0,0 +1,8 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/keymgt/loadkey.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/keymgt/loadkey.h diff --git a/src/feature/nodelist/include.am b/src/feature/nodelist/include.am new file mode 100644 index 000000000..2f5d58ec1 --- /dev/null +++ b/src/feature/nodelist/include.am @@ -0,0 +1,49 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/nodelist/authcert.c \ + src/feature/nodelist/describe.c \ + src/feature/nodelist/dirlist.c \ + src/feature/nodelist/microdesc.c \ + src/feature/nodelist/networkstatus.c \ + src/feature/nodelist/nickname.c \ + src/feature/nodelist/nodefamily.c \ + src/feature/nodelist/nodelist.c \ + src/feature/nodelist/node_select.c \ + src/feature/nodelist/routerinfo.c \ + src/feature/nodelist/routerlist.c \ + src/feature/nodelist/routerset.c \ + src/feature/nodelist/fmt_routerstatus.c \ + src/feature/nodelist/torcert.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/nodelist/authcert.h \ + src/feature/nodelist/authority_cert_st.h \ + src/feature/nodelist/describe.h \ + src/feature/nodelist/desc_store_st.h \ + src/feature/nodelist/dirlist.h \ + src/feature/nodelist/document_signature_st.h \ + src/feature/nodelist/extrainfo_st.h \ + src/feature/nodelist/microdesc.h \ + src/feature/nodelist/microdesc_st.h \ + src/feature/nodelist/networkstatus.h \ + src/feature/nodelist/networkstatus_sr_info_st.h \ + src/feature/nodelist/networkstatus_st.h \ + src/feature/nodelist/networkstatus_voter_info_st.h \ + src/feature/nodelist/nickname.h \ + src/feature/nodelist/node_st.h \ + src/feature/nodelist/nodefamily.h \ + src/feature/nodelist/nodefamily_st.h \ + src/feature/nodelist/nodelist.h \ + src/feature/nodelist/node_select.h \ + src/feature/nodelist/routerinfo.h \ + src/feature/nodelist/routerinfo_st.h \ + src/feature/nodelist/routerlist.h \ + src/feature/nodelist/routerlist_st.h \ + src/feature/nodelist/routerset.h \ + src/feature/nodelist/fmt_routerstatus.h \ + src/feature/nodelist/routerstatus_st.h \ + src/feature/nodelist/signed_descriptor_st.h \ + src/feature/nodelist/torcert.h \ + src/feature/nodelist/vote_routerstatus_st.h diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am new file mode 100644 index 000000000..aa9aa3adf --- /dev/null +++ b/src/feature/relay/include.am @@ -0,0 +1,39 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/relay/dns.c \ + src/feature/relay/ext_orport.c \ + src/feature/relay/onion_queue.c \ + src/feature/relay/router.c \ + src/feature/relay/routerkeys.c \ + src/feature/relay/selftest.c + +# The Relay module. +# ADD_C_FILE: INSERT SOURCES HERE. +MODULE_RELAY_SOURCES = \ + src/feature/relay/routermode.c \ + src/feature/relay/relay_config.c \ + src/feature/relay/relay_periodic.c \ + src/feature/relay/relay_sys.c \ + src/feature/relay/transport_config.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/relay/dns.h \ + src/feature/relay/dns_structs.h \ + src/feature/relay/ext_orport.h \ + src/feature/relay/onion_queue.h \ + src/feature/relay/relay_config.h \ + src/feature/relay/relay_periodic.h \ + src/feature/relay/relay_sys.h \ + src/feature/relay/router.h \ + src/feature/relay/routerkeys.h \ + src/feature/relay/routermode.h \ + src/feature/relay/selftest.h \ + src/feature/relay/transport_config.h + +if BUILD_MODULE_RELAY +LIBTOR_APP_A_SOURCES += $(MODULE_RELAY_SOURCES) +else +LIBTOR_APP_A_STUB_SOURCES += src/feature/relay/relay_stub.c +endif diff --git a/src/feature/rend/include.am b/src/feature/rend/include.am new file mode 100644 index 000000000..fb12439a9 --- /dev/null +++ b/src/feature/rend/include.am @@ -0,0 +1,22 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/rend/rendcache.c \ + src/feature/rend/rendclient.c \ + src/feature/rend/rendcommon.c \ + src/feature/rend/rendmid.c \ + src/feature/rend/rendparse.c \ + src/feature/rend/rendservice.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/rend/rend_authorized_client_st.h \ + src/feature/rend/rend_encoded_v2_service_descriptor_st.h \ + src/feature/rend/rend_intro_point_st.h \ + src/feature/rend/rend_service_descriptor_st.h \ + src/feature/rend/rendcache.h \ + src/feature/rend/rendclient.h \ + src/feature/rend/rendcommon.h \ + src/feature/rend/rendmid.h \ + src/feature/rend/rendparse.h \ + src/feature/rend/rendservice.h diff --git a/src/feature/stats/include.am b/src/feature/stats/include.am new file mode 100644 index 000000000..8789bc3d9 --- /dev/null +++ b/src/feature/stats/include.am @@ -0,0 +1,12 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/stats/geoip_stats.c \ + src/feature/stats/rephist.c \ + src/feature/stats/predict_ports.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/stats/geoip_stats.h \ + src/feature/stats/rephist.h \ + src/feature/stats/predict_ports.h diff --git a/src/include.am b/src/include.am index 065bdc31c..f5f868d23 100644 --- a/src/include.am +++ b/src/include.am @@ -1,4 +1,5 @@ include src/ext/include.am + include src/lib/arch/include.am include src/lib/buf/include.am include src/lib/err/include.am @@ -42,6 +43,42 @@ include src/lib/version/include.am include src/lib/wallclock/include.am include src/trunnel/include.am +noinst_LIBRARIES += src/core/libtor-app.a +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/core/libtor-app-testing.a +endif + +LIBTOR_APP_A_SOURCES = +# +# Sources that we only add for the real libtor_a, and not for testing. +# +LIBTOR_APP_A_STUB_SOURCES = + +include src/core/crypto/include.am +include src/core/mainloop/include.am +include src/core/or/include.am +include src/core/proto/include.am + +include src/feature/api/include.am +include src/feature/client/include.am +include src/feature/control/include.am +include src/feature/dirauth/include.am +include src/feature/dircache/include.am +include src/feature/dirclient/include.am +include src/feature/dircommon/include.am +include src/feature/dirparse/include.am +include src/feature/hibernate/include.am +include src/feature/hs_common/include.am +include src/feature/hs/include.am +include src/feature/keymgt/include.am +include src/feature/nodelist/include.am +include src/feature/relay/include.am +include src/feature/rend/include.am +include src/feature/stats/include.am + +include src/app/config/include.am +include src/app/main/include.am + include src/core/include.am include src/app/include.am

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1657'
by nickm＠torproject.org 15 Jan '20

15 Jan '20

commit 5e70c27e8560ac1885ae9d9e1b79d3838b49cc09 Merge: 5fa7c1b13 73ac1add3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 15 13:10:14 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1657' changes/ticket32137 | 4 + scripts/maint/add_c_file.py | 7 +- src/app/config/include.am | 21 ++ src/app/main/include.am | 18 ++ src/core/crypto/include.am | 18 ++ src/core/include.am | 453 +-------------------------------------- src/core/mainloop/include.am | 22 ++ src/core/or/include.am | 98 +++++++++ src/core/proto/include.am | 18 ++ src/feature/api/include.am | 11 + src/feature/client/include.am | 20 ++ src/feature/control/include.am | 39 ++++ src/feature/dirauth/include.am | 51 +++++ src/feature/dircache/include.am | 15 ++ src/feature/dirclient/include.am | 12 ++ src/feature/dircommon/include.am | 16 ++ src/feature/dirparse/include.am | 25 +++ src/feature/hibernate/include.am | 8 + src/feature/hs/include.am | 35 +++ src/feature/hs_common/include.am | 10 + src/feature/keymgt/include.am | 8 + src/feature/nodelist/include.am | 49 +++++ src/feature/relay/include.am | 39 ++++ src/feature/rend/include.am | 22 ++ src/feature/stats/include.am | 12 ++ src/include.am | 37 ++++ 26 files changed, 611 insertions(+), 457 deletions(-)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Jan '20

15 Jan '20

commit ce8513b8043b1cdf4e896118e7496e5201f4f0be Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 17:53:44 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contents+es.po b/contents+es.po index 0e034fe053..953682935d 100644 --- a/contents+es.po +++ b/contents+es.po @@ -8057,7 +8057,7 @@ msgstr "" #: (content/misc/glossary/contents+en.lrquestion.description) msgid "" "[Tor Browser](#tor-browser) prevents a lot of this activity from happening." -msgstr "[Navegador Tor](#tor-browser) impide mucha de esta actividad." +msgstr "El [Navegador Tor](#tor-browser) impide mucha de esta actividad." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8111,8 +8111,8 @@ msgid "" "Tor Browser uses the [Tor network](#tor-/-tor-network/-core-tor) to protect " "your privacy and anonymity." msgstr "" -"El Navegador Tor usa la red [Tor network](#tor-/-tor-network/-core-tor) para" -" proteger tu privacidad y anonimato." +"El Navegador Tor usa la [red Tor](#tor-/-tor-network/-core-tor) para " +"proteger tu privacidad y anonimato." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8140,8 +8140,8 @@ msgid "" " browser configuration." msgstr "" "Además, el Navegador Tor está diseñado para prevenir que los sitios web te " -"\"[fingerprinting](#browser-fingerprinting)\" o identifiquen basándose en la" -" configuración de tu navegador." +"\"[creen una huella digital](#browser-fingerprinting)\" o te identifiquen " +"basándose en la configuración de tu navegador." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8158,9 +8158,9 @@ msgid "" "[Cookies](#cookie) are only valid for a single [session](#session) (until " "Tor Browser is exited or a [New Identity](#new-identity) is requested)." msgstr "" -"Las [Cookies](#cookie) sólo son válidas para una única [session](#session) " -"(hasta que se salga del Navegador Tor o se solicite una [New Identity](#new-" -"identity)." +"Las [cookies](#cookie) sólo son válidas para una única [sesión](#session) " +"(hasta que se salga del Navegador Tor o se solicite una [Nueva Identidad" +"](#new-identity)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8245,7 +8245,7 @@ msgid "" "network/-core-tor)." msgstr "" "Tor Messenger era un programa de chat multiplataforma que apuntaba ser " -"seguro por defecto y enviaba todo tu [traffic](#traffic) por [Tor](#tor" +"seguro por defecto y enviaba todo tu [tráfico](#traffic) por [Tor](#tor" "-/-tor-network/-core-tor)." #: https//support.torproject.org/misc/glossary/ @@ -8337,9 +8337,9 @@ msgid "" "/-core-tor)-related protections the [client](#client) would otherwise have." msgstr "" "NOTE: Esto no es tan seguro como conectarse al [servicio onion](#onion-" -"services) vía Navegador Tor, y removerá todas las protecciones relacionadas " -"con [Tor](#tor-/-tor-network/-core-tor) que el [cliente](#cliente) de otra " -"forma tendría." +"services) a traves del Navegador Tor, y removerá todas las protecciones " +"relacionadas con [Tor](#tor-/-tor-network/-core-tor) que el " +"[cliente](#cliente) de otra forma tendría." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Jan '20

15 Jan '20

commit 0f055fb9d62b3298d0d898ea2ae47ecabd5e4cf0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 17:23:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 38f0bfcf0b..30ae34524f 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -5789,7 +5789,7 @@ msgstr "" #: https//support.torproject.org/operators/what-is-the-bad-exit-flag/ #: (content/operators/what-is-the-bad-exit-flag/contents+en.lrquestion.title) msgid "What is the BadExit flag?" -msgstr "" +msgstr "Что означает флаг BadExit?" #: https//support.torproject.org/operators/what-is-the-bad-exit-flag/ #: (content/operators/what-is-the-bad-exit-flag/contents+en.lrquestion.description) @@ -5798,6 +5798,9 @@ msgid "" "This tells Tor to avoid exiting through that relay. In effect, relays with " "this flag become non-exits." msgstr "" +"Когда выходной узел неверно настроен или в руках злоумышленников, ему " +"присваивается флаг BadExit. Для Tor это значит \"не пропускать трафик через " +"этот узел\". Иначе говоря, узлы с таким флагом перестают действовать." #: https//support.torproject.org/operators/what-is-the-bad-exit-flag/ #: (content/operators/what-is-the-bad-exit-flag/contents+en.lrquestion.description) @@ -5808,6 +5811,12 @@ msgid "" "team](https://community.torproject.org/relay/community-resources/bad-" "relays/) so we can sort out the issue." msgstr "" +"Если вашему узлу присвоен этот флаг, значит, мы обнаружили проблему или " +"подозрительную активность, когда наблюдали за трафиком, проходящим через ваш" +" узел, и не смогли с вами связаться. Чтобы решить вопрос, пожалуйста, " +"свяжитесь с теми, кто у нас [занимается плохими " +"узлами](https://community.torproject.org/relay/community-resources/bad-" +"relays/)." #: https//support.torproject.org/operators/what-type-of-relays-are-most-needed/ #: (content/operators/what-type-of-relays-are-most-needed/contents+en.lrquestion.title) @@ -5830,8 +5839,8 @@ msgid "" "* If you are looking to run a relay with minimal effort, fast guard relays " "are also very useful" msgstr "" -"* Если вас интересует узел, который требует минимальных усилий для запуска, " -"попробуйте быстрый входной узел." +"* Если вы предпочитаете минимум усилий для запуска, попробуйте организовать " +"быстрый входной узел." #: https//support.torproject.org/operators/what-type-of-relays-are-most-needed/ #: (content/operators/what-type-of-relays-are-most-needed/contents+en.lrquestion.description) @@ -5841,7 +5850,7 @@ msgstr "* Или мост." #: https//support.torproject.org/operators/why-i-get-portscanned-more-often/ #: (content/operators/why-i-get-portscanned-more-often/contents+en.lrquestion.title) msgid "Why do I get portscanned more often when I run a Tor relay?" -msgstr "" +msgstr "Почему мои порты сканируются чаще, когда я поддерживаю узел Tor?" #: https//support.torproject.org/operators/why-i-get-portscanned-more-often/ #: (content/operators/why-i-get-portscanned-more-often/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Jan '20

15 Jan '20

commit 4833fafec89c8297304c96ea5fc929d1fc92c2e2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 16:54:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 10 ++++------ contents+ru.po | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/contents+es.po b/contents+es.po index 2351c117e5..0e034fe053 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2822,12 +2822,10 @@ msgid "" "Browser](https://support.torproject.org/#tbb-10), it is common for anti-" "virus / anti-malware software to cause this type of issue." msgstr "" -"Si estás ejecuanto un anti-virus, por favor, mira [Mi antivirus/malware está impidiéndome el acceso al Tor Browser](https://support.torproject.org/es/tbb/tbb-10), es normal para el software anti-virus / anti-malware ocasionar este tipo de problemas.\n" -" \n" -" \n" -" \n" -" \n" -" " +"Si estás ejecuanto un anti-virus, por favor, mira [Mi antivirus/malware está" +" impidiéndome el acceso al Tor " +"Browser](https://support.torproject.org/es/tbb/tbb-10), es normal para el " +"software anti-virus / anti-malware ocasionar este tipo de problemas." #: https//support.torproject.org/tbb/tbb-43/ #: (content/tbb/tbb-43/contents+en.lrquestion.title) diff --git a/contents+ru.po b/contents+ru.po index f7e9d5d609..38f0bfcf0b 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -5499,17 +5499,17 @@ msgstr "" #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.title) msgid "How stable does my relay need to be?" -msgstr "" +msgstr "Насколько стабильно должен работать мой узел?" #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description) msgid "We aim to make setting up a Tor relay easy and convenient:" -msgstr "" +msgstr "Мы хотим, чтобы организация узла Tor была простой и удобной:" #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description) msgid "* It's fine if the relay goes offline sometimes." -msgstr "" +msgstr "Ничего, если узел иногда оказывается офлайн." #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 15 Jan '20

15 Jan '20

commit 00181c0197a82e59c2b7114f4c8628b6f4ed2244 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 15 16:45:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 74 +++++++++++++++++++++++++++++----------------------------- contents+tr.po | 60 ++++++++++++++++++++++++----------------------- 2 files changed, 68 insertions(+), 66 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 710f3c8ebe..6e85d4b470 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -7,7 +7,7 @@ # Martus Translations <translations(a)martus.org>, 2019 # erinm, 2019 # Ahmed IB <mee.tbhole(a)gmail.com>, 2019 -# Emma Peel, 2019 +# Emma Peel, 2020 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Emma Peel, 2020\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3971,7 +3971,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "IPv6Exit 1" -msgstr "" +msgstr "IPv6Exit 1" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -8473,7 +8473,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "pkg update -f" -msgstr "" +msgstr "pkg update -f" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -8594,7 +8594,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "service tor start" -msgstr "" +msgstr "service tor start" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -8676,7 +8676,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "export OR_PORT=X" -msgstr "" +msgstr "export OR_PORT=X" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -8716,7 +8716,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "source bridge.sh && make deploy" -msgstr "" +msgstr "source bridge.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -8751,12 +8751,12 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "source bridge-1.sh && make deploy" -msgstr "" +msgstr "source bridge-1.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "source bridge-2.sh && make deploy" -msgstr "" +msgstr "source bridge-2.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9019,7 +9019,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/fedora/ #: (content/relay-operations/technical-setup/bridge/fedora/contents+en.lrpage.body) msgid "systemctl restart tor" -msgstr "" +msgstr "systemctl restart tor" #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.title) @@ -9137,12 +9137,12 @@ msgstr "url: \"pkg+https://pkg.FreeBSD.org/${ABI}/latest\"," #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) msgid "mirror_type: \"srv\"," -msgstr "" +msgstr "mirror_type: \"srv\"," #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) msgid "signature_type: \"fingerprints\"," -msgstr "" +msgstr "signature_type: \"fingerprints\"," #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) @@ -9152,7 +9152,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) msgid "enabled: yes" -msgstr "" +msgstr "enabled: yes" #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) @@ -9171,7 +9171,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.title) msgid "OpenBSD" -msgstr "" +msgstr "OpenBSD" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.subtitle) @@ -9196,12 +9196,12 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "User _tor" -msgstr "" +msgstr "User _tor" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "DataDirectory /var/tor" -msgstr "" +msgstr "DataDirectory /var/tor" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) @@ -9231,7 +9231,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "rcctl start tor" -msgstr "" +msgstr "rcctl start tor" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) @@ -9260,7 +9260,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "pkg_add tor" -msgstr "" +msgstr "pkg_add tor" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9315,7 +9315,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "ExitRelay 0" -msgstr "" +msgstr "ExitRelay 0" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9326,7 +9326,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "SocksPort 0" -msgstr "" +msgstr "SocksPort 0" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9337,7 +9337,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "Log notice syslog" -msgstr "" +msgstr "Log notice syslog" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9401,7 +9401,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "pkg install tor" -msgstr "" +msgstr "pkg install tor" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) @@ -9511,7 +9511,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) msgid "`yum install tor`" -msgstr "" +msgstr "`yum install tor`" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -9543,7 +9543,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) msgid "Nickname myNiceRelay" -msgstr "" +msgstr "Nickname myNiceRelay" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -9557,7 +9557,7 @@ msgstr "ORPort 9001" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) msgid "SocksPort 0" -msgstr "" +msgstr "SocksPort 0" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -9566,7 +9566,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) msgid "ExitRelay 0" -msgstr "" +msgstr "ExitRelay 0" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -9609,7 +9609,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/fedora/ #: (content/relay-operations/technical-setup/guard/fedora/contents+en.lrpage.body) msgid "systemctl start tor" -msgstr "" +msgstr "systemctl start tor" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -9693,7 +9693,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) msgid "`apt update && apt install tor`" -msgstr "" +msgstr "`apt update && apt install tor`" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) @@ -9713,7 +9713,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) msgid "ControlSocket 0" -msgstr "" +msgstr "ControlSocket 0" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) @@ -9917,7 +9917,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "User _tor" -msgstr "" +msgstr "User _tor" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) @@ -9941,17 +9941,17 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "tor:" -msgstr "" +msgstr "tor:" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid ":openfiles-max=13500:" -msgstr "" +msgstr ":openfiles-max=13500:" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid ":tc=daemon:" -msgstr "" +msgstr ":tc=daemon:" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) @@ -10170,7 +10170,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/centosrhel/updates/ #: (content/relay-operations/technical-setup/guard/centosrhel/updates/contents+en.lrpage.body) msgid "download_updates = yes" -msgstr "" +msgstr "download_updates = yes" #: https//community.torproject.org/relay/setup/guard/centosrhel/updates/ #: (content/relay-operations/technical-setup/guard/centosrhel/updates/contents+en.lrpage.body) @@ -10315,7 +10315,7 @@ msgstr "\"origin=Debian,codename=${distro_codename},label=Debian-Security\";" #: https//community.torproject.org/relay/setup/guard/debianubuntu/updates/ #: (content/relay-operations/technical-setup/guard/debianubuntu/updates/contents+en.lrpage.body) msgid "\"origin=TorProject\";" -msgstr "" +msgstr "\"origin=TorProject\";" #: https//community.torproject.org/relay/setup/guard/debianubuntu/updates/ #: (content/relay-operations/technical-setup/guard/debianubuntu/updates/contents+en.lrpage.body) @@ -10390,7 +10390,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/updates/ #: (content/relay-operations/technical-setup/guard/freebsd/updates/contents+en.lrpage.title) msgid "*BSD" -msgstr "" +msgstr "*BSD" #: https//community.torproject.org/relay/setup/guard/freebsd/updates/ #: (content/relay-operations/technical-setup/guard/freebsd/updates/contents+en.lrpage.body) @@ -10461,7 +10461,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/updates/ #: (content/relay-operations/technical-setup/guard/freebsd/updates/contents+en.lrpage.body) msgid "# service cron restart" -msgstr "" +msgstr "# service cron restart" #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5 diff --git a/contents+tr.po b/contents+tr.po index 78411b5c90..e3c30cfc72 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -2,8 +2,8 @@ # Erdoğan Şahin, 2019 # erinm, 2019 # Barış <bariserenkara(a)gmail.com>, 2019 -# Emma Peel, 2019 # Kaya Zeren <kayazeren(a)gmail.com>, 2019 +# Emma Peel, 2020 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2020\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -422,6 +422,8 @@ msgid "" "(\"ORPort\" configuration: We recommend port 443 if that is not used by " "another daemon on your server already." msgstr "" +"(\"ORPort\" yapılandırması: Sunucunuzdaki başka bir arka plan işlemi " +"tarafından kullanılmıyorsa, 443 numaralı kapının kullanılması önerilir." #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body) @@ -4051,7 +4053,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) msgid "IPv6Exit 1" -msgstr "" +msgstr "IPv6Exit 1" #: https//community.torproject.org/relay/setup/post-install/ #: (content/relay-operations/technical-setup/post-install/contents+en.lrpage.body) @@ -8553,7 +8555,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "pkg update -f" -msgstr "" +msgstr "pkg update -f" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -8674,7 +8676,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "service tor start" -msgstr "" +msgstr "service tor start" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -8756,7 +8758,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "export OR_PORT=X" -msgstr "" +msgstr "export OR_PORT=X" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -8796,7 +8798,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "source bridge.sh && make deploy" -msgstr "" +msgstr "source bridge.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -8831,12 +8833,12 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "source bridge-1.sh && make deploy" -msgstr "" +msgstr "source bridge-1.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "source bridge-2.sh && make deploy" -msgstr "" +msgstr "source bridge-2.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -9099,7 +9101,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/fedora/ #: (content/relay-operations/technical-setup/bridge/fedora/contents+en.lrpage.body) msgid "systemctl restart tor" -msgstr "" +msgstr "systemctl restart tor" #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.title) @@ -9217,12 +9219,12 @@ msgstr "url: \"pkg+https://pkg.FreeBSD.org/${ABI}/latest\"," #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) msgid "mirror_type: \"srv\"," -msgstr "" +msgstr "mirror_type: \"srv\"," #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) msgid "signature_type: \"fingerprints\"," -msgstr "" +msgstr "signature_type: \"fingerprints\"," #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) @@ -9232,7 +9234,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) msgid "enabled: yes" -msgstr "" +msgstr "enabled: yes" #: https//community.torproject.org/relay/setup/bridge/freebsd/ #: (content/relay-operations/technical-setup/bridge/freebsd/contents+en.lrpage.body) @@ -9276,12 +9278,12 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "User _tor" -msgstr "" +msgstr "User _tor" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "DataDirectory /var/tor" -msgstr "" +msgstr "DataDirectory /var/tor" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) @@ -9311,7 +9313,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "rcctl start tor" -msgstr "" +msgstr "rcctl start tor" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) @@ -9340,7 +9342,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "pkg_add tor" -msgstr "" +msgstr "pkg_add tor" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9395,7 +9397,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "ExitRelay 0" -msgstr "" +msgstr "ExitRelay 0" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9406,7 +9408,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "SocksPort 0" -msgstr "" +msgstr "SocksPort 0" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9417,7 +9419,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "Log notice syslog" -msgstr "" +msgstr "Log notice syslog" #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) @@ -9481,7 +9483,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "pkg install tor" -msgstr "" +msgstr "pkg install tor" #: https//community.torproject.org/relay/setup/guard/dragonflybsd/ #: (content/relay-operations/technical-setup/guard/dragonflybsd/contents+en.lrpage.body) @@ -9591,7 +9593,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) msgid "`yum install tor`" -msgstr "" +msgstr "`yum install tor`" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -9623,7 +9625,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) msgid "Nickname myNiceRelay" -msgstr "" +msgstr "Nickname myNiceRelay" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -9689,7 +9691,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/fedora/ #: (content/relay-operations/technical-setup/guard/fedora/contents+en.lrpage.body) msgid "systemctl start tor" -msgstr "" +msgstr "systemctl start tor" #: https//community.torproject.org/relay/setup/guard/centosrhel/ #: (content/relay-operations/technical-setup/guard/centosrhel/contents+en.lrpage.body) @@ -9773,7 +9775,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) msgid "`apt update && apt install tor`" -msgstr "" +msgstr "`apt update && apt install tor`" #: https//community.torproject.org/relay/setup/guard/debianubuntu/ #: (content/relay-operations/technical-setup/guard/debianubuntu/contents+en.lrpage.body) @@ -9997,7 +9999,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) msgid "User _tor" -msgstr "" +msgstr "User _tor" #: https//community.torproject.org/relay/setup/guard/openbsd/ #: (content/relay-operations/technical-setup/guard/openbsd/contents+en.lrpage.body) @@ -10250,7 +10252,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/centosrhel/updates/ #: (content/relay-operations/technical-setup/guard/centosrhel/updates/contents+en.lrpage.body) msgid "download_updates = yes" -msgstr "" +msgstr "download_updates = yes" #: https//community.torproject.org/relay/setup/guard/centosrhel/updates/ #: (content/relay-operations/technical-setup/guard/centosrhel/updates/contents+en.lrpage.body) @@ -10395,7 +10397,7 @@ msgstr "\"origin=Debian,codename=${distro_codename},label=Debian-Security\";" #: https//community.torproject.org/relay/setup/guard/debianubuntu/updates/ #: (content/relay-operations/technical-setup/guard/debianubuntu/updates/contents+en.lrpage.body) msgid "\"origin=TorProject\";" -msgstr "" +msgstr "\"origin=TorProject\";" #: https//community.torproject.org/relay/setup/guard/debianubuntu/updates/ #: (content/relay-operations/technical-setup/guard/debianubuntu/updates/contents+en.lrpage.body) @@ -10541,7 +10543,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/updates/ #: (content/relay-operations/technical-setup/guard/freebsd/updates/contents+en.lrpage.body) msgid "# service cron restart" -msgstr "" +msgstr "# service cron restart" #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5

1 0

[community/translations] Update link for Tor FAQ
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 55e30a679931a6aabb294a1beb8e8101357d22d8 Author: IvetaHron <48660940+IvetaHron(a)users.noreply.github.com> Date: Tue Oct 22 16:42:18 2019 +0100 Update link for Tor FAQ Update link for Tor FAQ to Support portal. --- content/relay-operations/community-resources/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/community-resources/contents.lr b/content/relay-operations/community-resources/contents.lr index 3a83530..f2e2f0e 100644 --- a/content/relay-operations/community-resources/contents.lr +++ b/content/relay-operations/community-resources/contents.lr @@ -95,6 +95,6 @@ Congratulations, you're officially a Tor relay operator! What now? * You can check out traffic and other statistics for your relay at our [Relay Search](https://metrics.torproject.org/rs.html) (your relay will appear on "Relay Search" about 3 hours after you started it). -* There is also more info about running a relay at the [Tor FAQ](https://2019.www.torproject.org/docs/faq.html.en#HowDoIDecide). +* There is also more info about running a relay at the [Tor FAQ](https://support.torproject.org/operators/). * And, most importantly, make sure to email tshirt(a)torproject.org and [claim your swag](swag). It's our way of saying thanks for defending privacy and free speech online.

1 0