- tor-commits - lists.torproject.org

[tor/master] practracker: add ability to regenerate exceptions file.
by nickm＠torproject.org 27 Mar '19

27 Mar '19

commit c2643842a9a93f131f7b1244cce253be657acc8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 25 16:06:26 2019 -0400 practracker: add ability to regenerate exceptions file. Also add a useful argument parser. --- scripts/maint/practracker/practracker.py | 44 +++++++++++++++++++++++++------- scripts/maint/practracker/problem.py | 5 +++- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 9f8741521..4be1a31b5 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -117,8 +117,8 @@ HEADER="""\ # Welcome to the exceptions file for Tor's best-practices tracker! # # Each line of this file represents a single violation of Tor's best -# practices -- ideally one that was grandfathered in from before practracker.py -# existed. +# practices -- typically, a violation that we had before practracker.py +# first existed. # # There are three kinds of problems that we recognize right now: # function-size -- a function of more than {MAX_FUNCTION_SIZE} lines. @@ -142,17 +142,30 @@ HEADER="""\ # # You can either edit this file by hand, or regenerate it completely by # running `make practracker-regen`. +# +# Remember: It is better to fix the problem than to add a new exception! """.format(**globals()) def main(argv): - if (len(argv) != 2): - print("Usage:\n\t$ practracker.py <tor topdir>\n\t(e.g. $ practracker.py ~/tor/)") - return + import argparse + + progname = argv[0] + parser = argparse.ArgumentParser(prog=progname) + parser.add_argument("--regen", action="store_true", + help="Regenerate the exceptions file") + parser.add_argument("--exceptions", + help="Override the location for the exceptions file") + parser.add_argument("topdir", default=".", nargs="?", + help="Top-level directory for the tor source") + args = parser.parse_args(argv[1:]) global TOR_TOPDIR - TOR_TOPDIR = sys.argv[1] - exceptions_file = os.path.join(TOR_TOPDIR, "scripts/maint/practracker", EXCEPTIONS_FNAME) + TOR_TOPDIR = args.topdir + if args.exceptions: + exceptions_file = args.exceptions + else: + exceptions_file = os.path.join(TOR_TOPDIR, "scripts/maint/practracker", EXCEPTIONS_FNAME) # 1) Get all the .c files we care about files_list = util.get_tor_c_files(TOR_TOPDIR) @@ -160,13 +173,26 @@ def main(argv): # 2) Initialize problem vault and load an optional exceptions file so that # we don't warn about the past global ProblemVault - ProblemVault = problem.ProblemVault(exceptions_file) + + if args.regen: + tmpname = exceptions_file + ".tmp" + tmpfile = open(tmpname, "w") + sys.stdout = tmpfile + sys.stdout.write(HEADER) + ProblemVault = problem.ProblemVault() + else: + ProblemVault = problem.ProblemVault(exceptions_file) # 3) Go through all the files and report problems if they are not exceptions found_new_issues = consider_all_metrics(files_list) + if args.regen: + tmpfile.close() + os.rename(tmpname, exceptions_file) + sys.exit(0) + # If new issues were found, try to give out some advice to the developer on how to resolve it. - if (found_new_issues): + if found_new_issues and not args.regen: new_issues_str = """\ FAILURE: practracker found new problems in the code: see warnings above. diff --git a/scripts/maint/practracker/problem.py b/scripts/maint/practracker/problem.py index d5ebedd17..c82c5db57 100644 --- a/scripts/maint/practracker/problem.py +++ b/scripts/maint/practracker/problem.py @@ -19,10 +19,13 @@ class ProblemVault(object): found in the code, and also the old problems we read from the exception file. """ - def __init__(self, exception_fname): + def __init__(self, exception_fname=None): # Exception dictionary: { problem.key() : Problem object } self.exceptions = {} + if exception_fname == None: + return + try: with open(exception_fname, 'r') as exception_f: self.register_exceptions(exception_f)

1 0

[tor/master] Practracker: add a string explaining the excptions file.
by nickm＠torproject.org 27 Mar '19

27 Mar '19

commit 301e3f22eff5021b0855a70cf98a1ccee69a19a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 25 15:51:48 2019 -0400 Practracker: add a string explaining the excptions file. --- scripts/maint/practracker/practracker.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index a6e6d0b60..aec7c8b29 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -113,6 +113,38 @@ def consider_metrics_for_file(fname, f): return found_new_issues +HEADER="""\ +# Welcome to the exceptions file for Tor's best-practices tracker! +# +# Each line of this file represents a single violation of Tor's best +# practices -- ideally one that was grandfathered in from before practracker.py +# existed. +# +# There are three kinds of problems that we recognize right now: +# function-size -- a function of more than {MAX_FUNCTION_SIZE} lines. +# file-size -- a file of more than {MAX_FILE_SIZE} lines. +# include-count -- a file with more than {MAX_INCLUDE_COUNT} #includes. +# +# Each line below represents a single exception that practracker should +# _ignore_. Each line has four parts: +# 1. The word "problem". +# 2. The kind of problem. +# 3. The location of the problem: either a filename, or a +# filename:functionname pair. +# 4. The magnitude of the problem to ignore. +# +# So for example, consider this line: +# problem file-size /src/core/or/connection_or.c 3200 +# +# It tells practracker to allow the mentioned file to be up to 3200 lines +# long, even though ordinarily it would warn about any file with more than +# {MAX_FILE_SIZE} lines. +# +# You can either edit this file by hand, or regenerate it completely by +# running `make practracker-regen`. + +""".format(**globals()) + def main(): if (len(sys.argv) != 2): print("Usage:\n\t$ practracker.py <tor topdir>\n\t(e.g. $ practracker.py ~/tor/)")

1 0

[tor/master] Add a practracker-regen make target
by nickm＠torproject.org 27 Mar '19

27 Mar '19

commit 2c8af79de52d091f98aa94615d9e6dd69faba0c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 25 16:07:58 2019 -0400 Add a practracker-regen make target --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 415c2f2b4..eea7c3a12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -352,6 +352,9 @@ if USEPYTHON $(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py $(top_srcdir) endif +practracker-regen: + $(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py --regen $(top_srcdir) + check-docs: all $(PERL) $(top_builddir)/scripts/maint/checkOptionDocs.pl

1 0

[tor/master] practracker: update usage note in docstring
by nickm＠torproject.org 27 Mar '19

27 Mar '19

commit 39e449434421c8af5d8d6e89b4b4a1bccd78f284 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 26 08:42:14 2019 -0400 practracker: update usage note in docstring --- scripts/maint/practracker/practracker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 4be1a31b5..c2efa61f2 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -13,9 +13,9 @@ practracker.py should be run with its second argument pointing to the Tor top-level source directory like this: $ python3 ./scripts/maint/practracker/practracker.py . -The exceptions file is meant to be initialized once with the current state of -the source code and then get saved in the repository for ever after: - $ python3 ./scripts/maint/practracker/practracker.py . > ./scripts/maint/practracker/exceptions.txt +To regenerate the exceptions file so that it allows all current +problems in the Tor source, use the --regen flag: + $ python3 --regen ./scripts/maint/practracker/practracker.py . """ from __future__ import print_function

1 0

[tor/master] practracker: pass sys.argv to main() as an argument
by nickm＠torproject.org 27 Mar '19

27 Mar '19

commit 0260e0f6fc46cd196c59d3d2c4551be2f15a7547 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 25 15:52:43 2019 -0400 practracker: pass sys.argv to main() as an argument --- scripts/maint/practracker/practracker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index aec7c8b29..9f8741521 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -145,8 +145,8 @@ HEADER="""\ """.format(**globals()) -def main(): - if (len(sys.argv) != 2): +def main(argv): + if (len(argv) != 2): print("Usage:\n\t$ practracker.py <tor topdir>\n\t(e.g. $ practracker.py ~/tor/)") return @@ -180,4 +180,4 @@ See doc/HACKING/HelpfulTools.md for more information on using practracker.\ sys.exit(found_new_issues) if __name__ == '__main__': - main() + main(sys.argv)

1 0

[tor/master] Regenerate practracker file from scratch.
by nickm＠torproject.org 27 Mar '19

27 Mar '19

commit 7502e5467b5b22bee118616d393ace5d67b3607f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 26 19:28:28 2019 -0400 Regenerate practracker file from scratch. Closes ticket 29912. Since this is the first time that practracker has had a stable output order, this diff will be larger than usual. --- scripts/maint/practracker/exceptions.txt | 379 +++++++++++++++++-------------- 1 file changed, 203 insertions(+), 176 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index baccbef25..9e372728c 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -1,31 +1,96 @@ -problem function-size /src/core/proto/proto_socks.c:parse_socks_client() 112 +# Welcome to the exceptions file for Tor's best-practices tracker! +# +# Each line of this file represents a single violation of Tor's best +# practices -- typically, a violation that we had before practracker.py +# first existed. +# +# There are three kinds of problems that we recognize right now: +# function-size -- a function of more than 100 lines. +# file-size -- a file of more than 3000 lines. +# include-count -- a file with more than 50 #includes. +# +# Each line below represents a single exception that practracker should +# _ignore_. Each line has four parts: +# 1. The word "problem". +# 2. The kind of problem. +# 3. The location of the problem: either a filename, or a +# filename:functionname pair. +# 4. The magnitude of the problem to ignore. +# +# So for example, consider this line: +# problem file-size /src/core/or/connection_or.c 3200 +# +# It tells practracker to allow the mentioned file to be up to 3200 lines +# long, even though ordinarily it would warn about any file with more than +# 3000 lines. +# +# You can either edit this file by hand, or regenerate it completely by +# running `make practracker-regen`. +# +# Remember: It is better to fix the problem than to add a new exception! + +problem file-size /src/app/config/config.c 8490 +problem include-count /src/app/config/config.c 86 +problem function-size /src/app/config/config.c:options_act_reversible() 296 +problem function-size /src/app/config/config.c:options_act() 588 +problem function-size /src/app/config/config.c:resolve_my_address() 192 +problem function-size /src/app/config/config.c:options_validate() 1207 +problem function-size /src/app/config/config.c:options_init_from_torrc() 202 +problem function-size /src/app/config/config.c:options_init_from_string() 173 +problem function-size /src/app/config/config.c:options_init_logs() 146 +problem function-size /src/app/config/config.c:parse_bridge_line() 104 +problem function-size /src/app/config/config.c:parse_transport_line() 191 +problem function-size /src/app/config/config.c:parse_dir_authority_line() 151 +problem function-size /src/app/config/config.c:parse_dir_fallback_line() 102 +problem function-size /src/app/config/config.c:parse_port_config() 452 +problem function-size /src/app/config/config.c:parse_ports() 170 +problem function-size /src/app/config/config.c:getinfo_helper_config() 116 +problem function-size /src/app/config/confparse.c:config_assign_value() 205 +problem function-size /src/app/config/confparse.c:config_get_assigned_option() 129 +problem include-count /src/app/main/main.c 85 +problem function-size /src/app/main/main.c:dumpstats() 102 +problem function-size /src/app/main/main.c:tor_init() 136 +problem function-size /src/app/main/main.c:sandbox_init_filter() 291 +problem function-size /src/app/main/main.c:run_tor_main_loop() 105 +problem function-size /src/app/main/ntmain.c:nt_service_install() 125 +problem file-size /src/core/mainloop/connection.c 5548 +problem include-count /src/core/mainloop/connection.c 61 +problem function-size /src/core/mainloop/connection.c:connection_free_minimal() 184 +problem function-size /src/core/mainloop/connection.c:connection_listener_new() 328 +problem function-size /src/core/mainloop/connection.c:connection_handle_listener_read() 161 +problem function-size /src/core/mainloop/connection.c:connection_connect_sockaddr() 103 +problem function-size /src/core/mainloop/connection.c:connection_proxy_connect() 148 +problem function-size /src/core/mainloop/connection.c:connection_read_proxy_handshake() 153 +problem function-size /src/core/mainloop/connection.c:retry_listener_ports() 116 +problem function-size /src/core/mainloop/connection.c:connection_handle_read_impl() 111 +problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 177 +problem function-size /src/core/mainloop/connection.c:connection_handle_write_impl() 241 +problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 143 +problem file-size /src/core/mainloop/mainloop.c 3051 +problem include-count /src/core/mainloop/mainloop.c 66 +problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108 +problem function-size /src/core/mainloop/mainloop.c:run_connection_housekeeping() 123 +problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 116 problem file-size /src/core/or/channel.c 3476 -problem function-size /src/core/or/scheduler_kist.c:kist_scheduler_run() 171 -problem function-size /src/core/or/scheduler_vanilla.c:vanilla_scheduler_run() 109 -problem function-size /src/core/or/command.c:command_process_create_cell() 156 -problem function-size /src/core/or/command.c:command_process_relay_cell() 132 -problem function-size /src/core/or/protover.c:protover_all_supported() 116 -problem function-size /src/core/or/circuitmux.c:circuitmux_detach_all_circuits() 109 -problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 -problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 129 +problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 160 +problem function-size /src/core/or/channeltls.c:channel_tls_process_versions_cell() 170 +problem function-size /src/core/or/channeltls.c:channel_tls_process_netinfo_cell() 214 +problem function-size /src/core/or/channeltls.c:channel_tls_process_certs_cell() 246 +problem function-size /src/core/or/channeltls.c:channel_tls_process_authenticate_cell() 202 +problem file-size /src/core/or/circuitbuild.c 3060 +problem include-count /src/core/or/circuitbuild.c 53 +problem function-size /src/core/or/circuitbuild.c:get_unique_circ_id_by_chan() 128 +problem function-size /src/core/or/circuitbuild.c:circuit_extend() 147 +problem function-size /src/core/or/circuitbuild.c:choose_good_exit_server_general() 206 problem include-count /src/core/or/circuitlist.c 54 problem function-size /src/core/or/circuitlist.c:HT_PROTOTYPE() 128 problem function-size /src/core/or/circuitlist.c:circuit_free_() 137 problem function-size /src/core/or/circuitlist.c:circuit_find_to_cannibalize() 102 problem function-size /src/core/or/circuitlist.c:circuit_about_to_free() 120 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 -problem file-size /src/core/or/connection_or.c 3111 -problem include-count /src/core/or/connection_or.c 51 -problem function-size /src/core/or/connection_or.c:connection_or_group_set_badness_() 105 -problem function-size /src/core/or/connection_or.c:connection_or_client_learned_peer_id() 144 -problem function-size /src/core/or/connection_or.c:connection_or_compute_authenticate_cell_body() 235 -problem file-size /src/core/or/policies.c 3163 -problem function-size /src/core/or/policies.c:policy_summarize() 107 -problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 160 -problem function-size /src/core/or/channeltls.c:channel_tls_process_versions_cell() 170 -problem function-size /src/core/or/channeltls.c:channel_tls_process_netinfo_cell() 214 -problem function-size /src/core/or/channeltls.c:channel_tls_process_certs_cell() 246 -problem function-size /src/core/or/channeltls.c:channel_tls_process_authenticate_cell() 202 +problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 +problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 +problem function-size /src/core/or/circuitstats.c:circuit_build_times_parse_state() 124 problem file-size /src/core/or/circuituse.c 3150 problem function-size /src/core/or/circuituse.c:circuit_is_acceptable() 129 problem function-size /src/core/or/circuituse.c:circuit_expire_building() 394 @@ -34,6 +99,8 @@ problem function-size /src/core/or/circuituse.c:circuit_build_failed() 149 problem function-size /src/core/or/circuituse.c:circuit_launch_by_extend_info() 110 problem function-size /src/core/or/circuituse.c:circuit_get_open_circ_or_launch() 354 problem function-size /src/core/or/circuituse.c:connection_ap_handshake_attach_circuit() 244 +problem function-size /src/core/or/command.c:command_process_create_cell() 156 +problem function-size /src/core/or/command.c:command_process_relay_cell() 132 problem file-size /src/core/or/connection_edge.c 4550 problem include-count /src/core/or/connection_edge.c 64 problem function-size /src/core/or/connection_edge.c:connection_ap_expire_beginning() 117 @@ -44,14 +111,15 @@ problem function-size /src/core/or/connection_edge.c:connection_ap_handshake_sen problem function-size /src/core/or/connection_edge.c:connection_ap_handshake_socks_resolved() 106 problem function-size /src/core/or/connection_edge.c:connection_exit_begin_conn() 184 problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 102 -problem function-size /src/core/or/circuitstats.c:circuit_build_times_parse_state() 124 -problem function-size /src/core/or/versions.c:tor_version_parse() 104 -problem file-size /src/core/or/circuitbuild.c 3060 -problem include-count /src/core/or/circuitbuild.c 53 -problem function-size /src/core/or/circuitbuild.c:get_unique_circ_id_by_chan() 128 -problem function-size /src/core/or/circuitbuild.c:circuit_extend() 147 -problem function-size /src/core/or/circuitbuild.c:choose_good_exit_server_general() 206 -problem file-size /src/core/or/relay.c 3183 +problem file-size /src/core/or/connection_or.c 3111 +problem include-count /src/core/or/connection_or.c 51 +problem function-size /src/core/or/connection_or.c:connection_or_group_set_badness_() 105 +problem function-size /src/core/or/connection_or.c:connection_or_client_learned_peer_id() 144 +problem function-size /src/core/or/connection_or.c:connection_or_compute_authenticate_cell_body() 235 +problem file-size /src/core/or/policies.c 3163 +problem function-size /src/core/or/policies.c:policy_summarize() 107 +problem function-size /src/core/or/protover.c:protover_all_supported() 116 +problem file-size /src/core/or/relay.c 3173 problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 123 problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 101 problem function-size /src/core/or/relay.c:connection_ap_process_end_not_open() 194 @@ -59,91 +127,66 @@ problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell_no problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell() 520 problem function-size /src/core/or/relay.c:connection_edge_package_raw_inbuf() 130 problem function-size /src/core/or/relay.c:circuit_resume_edge_reading_helper() 148 -problem file-size /src/core/mainloop/mainloop.c 3051 -problem include-count /src/core/mainloop/mainloop.c 66 -problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108 -problem function-size /src/core/mainloop/mainloop.c:run_connection_housekeeping() 123 -problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 116 -problem file-size /src/core/mainloop/connection.c 5548 -problem include-count /src/core/mainloop/connection.c 61 -problem function-size /src/core/mainloop/connection.c:connection_free_minimal() 184 -problem function-size /src/core/mainloop/connection.c:connection_listener_new() 328 -problem function-size /src/core/mainloop/connection.c:connection_handle_listener_read() 161 -problem function-size /src/core/mainloop/connection.c:connection_connect_sockaddr() 103 -problem function-size /src/core/mainloop/connection.c:connection_proxy_connect() 148 -problem function-size /src/core/mainloop/connection.c:connection_read_proxy_handshake() 153 -problem function-size /src/core/mainloop/connection.c:retry_listener_ports() 116 -problem function-size /src/core/mainloop/connection.c:connection_handle_read_impl() 111 -problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 177 -problem function-size /src/core/mainloop/connection.c:connection_handle_write_impl() 241 -problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 143 -problem function-size /src/app/config/confparse.c:config_assign_value() 205 -problem function-size /src/app/config/confparse.c:config_get_assigned_option() 129 -problem file-size /src/app/config/config.c 8490 -problem include-count /src/app/config/config.c 86 -problem function-size /src/app/config/config.c:options_act_reversible() 296 -problem function-size /src/app/config/config.c:options_act() 588 -problem function-size /src/app/config/config.c:resolve_my_address() 192 -problem function-size /src/app/config/config.c:options_validate() 1207 -problem function-size /src/app/config/config.c:options_init_from_torrc() 202 -problem function-size /src/app/config/config.c:options_init_from_string() 173 -problem function-size /src/app/config/config.c:options_init_logs() 146 -problem function-size /src/app/config/config.c:parse_bridge_line() 104 -problem function-size /src/app/config/config.c:parse_transport_line() 191 -problem function-size /src/app/config/config.c:parse_dir_authority_line() 151 -problem function-size /src/app/config/config.c:parse_dir_fallback_line() 102 -problem function-size /src/app/config/config.c:parse_port_config() 452 -problem function-size /src/app/config/config.c:parse_ports() 170 -problem function-size /src/app/config/config.c:getinfo_helper_config() 116 -problem function-size /src/app/main/ntmain.c:nt_service_install() 125 -problem include-count /src/app/main/main.c 85 -problem function-size /src/app/main/main.c:dumpstats() 102 -problem function-size /src/app/main/main.c:tor_init() 136 -problem function-size /src/app/main/main.c:sandbox_init_filter() 291 -problem function-size /src/app/main/main.c:run_tor_main_loop() 105 -problem include-count /src/app/main/shutdown.c 55 -problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 104 -problem function-size /src/tools/tor-resolve.c:do_resolve() 173 -problem function-size /src/tools/tor-resolve.c:main() 112 -problem function-size /src/tools/tor-gencert.c:parse_commandline() 111 -problem function-size /src/feature/keymgt/loadkey.c:ed_key_init_from_file() 333 -problem function-size /src/feature/dircommon/consdiff.c:gen_ed_diff() 204 -problem function-size /src/feature/dircommon/consdiff.c:apply_ed_diff() 159 -problem function-size /src/feature/control/control_auth.c:handle_control_authenticate() 188 +problem function-size /src/core/or/scheduler_kist.c:kist_scheduler_run() 171 +problem function-size /src/core/or/scheduler_vanilla.c:vanilla_scheduler_run() 109 +problem function-size /src/core/or/versions.c:tor_version_parse() 104 +problem function-size /src/core/proto/proto_socks.c:parse_socks_client() 112 +problem function-size /src/feature/client/addressmap.c:addressmap_rewrite() 112 +problem function-size /src/feature/client/bridges.c:rewrite_node_address_for_bridge() 126 +problem function-size /src/feature/client/circpathbias.c:pathbias_measure_close_rate() 108 +problem function-size /src/feature/client/dnsserv.c:evdns_server_callback() 153 +problem file-size /src/feature/client/entrynodes.c 3817 +problem function-size /src/feature/client/entrynodes.c:entry_guards_upgrade_waiting_circuits() 153 +problem function-size /src/feature/client/entrynodes.c:entry_guard_parse_from_state() 246 +problem function-size /src/feature/client/transports.c:handle_proxy_line() 108 +problem function-size /src/feature/client/transports.c:parse_method_line_helper() 112 +problem function-size /src/feature/client/transports.c:create_managed_proxy_environment() 109 +problem function-size /src/feature/control/control.c:connection_control_process_inbuf() 144 problem function-size /src/feature/control/control_auth.c:handle_control_authchallenge() 115 -problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_misc() 109 -problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_dir() 304 -problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_events() 236 -problem function-size /src/feature/control/control_cmd.c:handle_control_command() 104 +problem function-size /src/feature/control/control_auth.c:handle_control_authenticate() 188 problem function-size /src/feature/control/control_cmd.c:handle_control_extendcircuit() 151 problem function-size /src/feature/control/control_cmd.c:handle_control_hsfetch() 114 problem function-size /src/feature/control/control_cmd.c:handle_control_hspost() 117 problem function-size /src/feature/control/control_cmd.c:handle_control_add_onion() 293 problem function-size /src/feature/control/control_cmd.c:add_onion_helper_keyarg() 125 -problem function-size /src/feature/control/control.c:connection_control_process_inbuf() 239 +problem function-size /src/feature/control/control_cmd.c:handle_control_command() 104 problem function-size /src/feature/control/control_events.c:control_event_stream_status() 119 problem include-count /src/feature/control/control_getinfo.c 52 -problem function-size /src/feature/stats/rephist.c:rep_hist_load_mtbf_data() 185 -problem function-size /src/feature/stats/rephist.c:rep_hist_format_exit_stats() 148 +problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_misc() 109 +problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_dir() 304 +problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_events() 236 +problem function-size /src/feature/dirauth/bwauth.c:dirserv_read_measured_bandwidths() 127 +problem file-size /src/feature/dirauth/dirvote.c 4729 +problem include-count /src/feature/dirauth/dirvote.c 53 +problem function-size /src/feature/dirauth/dirvote.c:format_networkstatus_vote() 251 +problem function-size /src/feature/dirauth/dirvote.c:networkstatus_compute_bw_weights_v10() 235 +problem function-size /src/feature/dirauth/dirvote.c:networkstatus_compute_consensus() 962 +problem function-size /src/feature/dirauth/dirvote.c:networkstatus_add_detached_signatures() 123 +problem function-size /src/feature/dirauth/dirvote.c:dirvote_add_vote() 162 +problem function-size /src/feature/dirauth/dirvote.c:dirvote_compute_consensuses() 164 +problem function-size /src/feature/dirauth/dirvote.c:dirserv_generate_networkstatus_vote_obj() 293 +problem function-size /src/feature/dirauth/dsigs_parse.c:networkstatus_parse_detached_signatures() 196 +problem function-size /src/feature/dirauth/guardfraction.c:dirserv_read_guardfraction_file_from_str() 110 +problem function-size /src/feature/dirauth/process_descs.c:dirserv_add_descriptor() 125 +problem function-size /src/feature/dirauth/shared_random.c:should_keep_commit() 110 +problem function-size /src/feature/dirauth/voteflags.c:dirserv_compute_performance_thresholds() 172 problem function-size /src/feature/dircache/consdiffmgr.c:consdiffmgr_cleanup() 115 problem function-size /src/feature/dircache/consdiffmgr.c:consdiffmgr_rescan_flavor_() 111 problem function-size /src/feature/dircache/consdiffmgr.c:consensus_diff_worker_threadfn() 132 problem function-size /src/feature/dircache/dircache.c:handle_get_current_consensus() 166 problem function-size /src/feature/dircache/dircache.c:directory_handle_command_post() 120 -problem function-size /src/feature/hibernate/hibernate.c:accounting_parse_options() 109 -problem function-size /src/feature/relay/routerkeys.c:load_ed_keys() 294 -problem file-size /src/feature/relay/router.c 3412 -problem include-count /src/feature/relay/router.c 56 -problem function-size /src/feature/relay/router.c:init_keys() 252 -problem function-size /src/feature/relay/router.c:get_my_declared_family() 114 -problem function-size /src/feature/relay/router.c:router_build_fresh_descriptor() 190 -problem function-size /src/feature/relay/router.c:router_build_fresh_unsigned_routerinfo() 140 -problem function-size /src/feature/relay/router.c:router_dump_router_to_string() 375 -problem function-size /src/feature/relay/router.c:extrainfo_dump_to_string() 208 -problem function-size /src/feature/relay/dns.c:dns_resolve_impl() 134 -problem function-size /src/feature/relay/dns.c:configure_nameservers() 161 -problem function-size /src/feature/relay/dns.c:evdns_callback() 109 +problem file-size /src/feature/dirclient/dirclient.c 3215 +problem include-count /src/feature/dirclient/dirclient.c 51 +problem function-size /src/feature/dirclient/dirclient.c:directory_get_from_dirserver() 131 +problem function-size /src/feature/dirclient/dirclient.c:directory_initiate_request() 201 +problem function-size /src/feature/dirclient/dirclient.c:directory_send_command() 241 +problem function-size /src/feature/dirclient/dirclient.c:dir_client_decompress_response_body() 114 +problem function-size /src/feature/dirclient/dirclient.c:connection_dir_client_reached_eof() 189 +problem function-size /src/feature/dirclient/dirclient.c:handle_response_fetch_consensus() 105 +problem function-size /src/feature/dircommon/consdiff.c:gen_ed_diff() 204 +problem function-size /src/feature/dircommon/consdiff.c:apply_ed_diff() 159 problem function-size /src/feature/dirparse/authcert_parse.c:authority_cert_parse_from_string() 182 +problem function-size /src/feature/dirparse/microdesc_parse.c:microdescs_parse_from_string() 154 problem function-size /src/feature/dirparse/ns_parse.c:routerstatus_parse_entry_from_string() 286 problem function-size /src/feature/dirparse/ns_parse.c:networkstatus_verify_bw_weights() 389 problem function-size /src/feature/dirparse/ns_parse.c:networkstatus_parse_vote_from_string() 638 @@ -151,44 +194,52 @@ problem function-size /src/feature/dirparse/parsecommon.c:tokenize_string() 103 problem function-size /src/feature/dirparse/parsecommon.c:get_next_token() 159 problem function-size /src/feature/dirparse/routerparse.c:router_parse_entry_from_string() 554 problem function-size /src/feature/dirparse/routerparse.c:extrainfo_parse_entry_from_string() 210 -problem function-size /src/feature/dirparse/microdesc_parse.c:microdescs_parse_from_string() 154 -problem file-size /src/feature/dirauth/dirvote.c 4729 -problem include-count /src/feature/dirauth/dirvote.c 53 -problem function-size /src/feature/dirauth/dirvote.c:format_networkstatus_vote() 251 -problem function-size /src/feature/dirauth/dirvote.c:networkstatus_compute_bw_weights_v10() 235 -problem function-size /src/feature/dirauth/dirvote.c:networkstatus_compute_consensus() 962 -problem function-size /src/feature/dirauth/dirvote.c:networkstatus_add_detached_signatures() 123 -problem function-size /src/feature/dirauth/dirvote.c:dirvote_add_vote() 162 -problem function-size /src/feature/dirauth/dirvote.c:dirvote_compute_consensuses() 164 -problem function-size /src/feature/dirauth/dirvote.c:dirserv_generate_networkstatus_vote_obj() 293 -problem function-size /src/feature/dirauth/guardfraction.c:dirserv_read_guardfraction_file_from_str() 110 -problem function-size /src/feature/dirauth/shared_random.c:should_keep_commit() 110 -problem function-size /src/feature/dirauth/process_descs.c:dirserv_add_descriptor() 125 -problem function-size /src/feature/dirauth/bwauth.c:dirserv_read_measured_bandwidths() 127 -problem function-size /src/feature/dirauth/dsigs_parse.c:networkstatus_parse_detached_signatures() 196 -problem function-size /src/feature/dirauth/voteflags.c:dirserv_compute_performance_thresholds() 172 -problem file-size /src/feature/hs/hs_service.c 4171 +problem function-size /src/feature/hibernate/hibernate.c:accounting_parse_options() 109 +problem function-size /src/feature/hs/hs_cell.c:hs_cell_build_establish_intro() 115 problem function-size /src/feature/hs/hs_cell.c:hs_cell_parse_introduce2() 154 -problem function-size /src/feature/hs/hs_common.c:hs_get_responsible_hsdirs() 104 -problem function-size /src/feature/hs/hs_common.c:hs_get_extend_info_from_lspecs() 101 problem function-size /src/feature/hs/hs_client.c:send_introduce1() 104 problem function-size /src/feature/hs/hs_client.c:hs_config_client_authorization() 108 +problem function-size /src/feature/hs/hs_common.c:hs_get_responsible_hsdirs() 104 +problem function-size /src/feature/hs/hs_common.c:hs_get_extend_info_from_lspecs() 101 problem function-size /src/feature/hs/hs_config.c:config_generic_service() 149 -problem function-size /src/feature/hs/hs_cell.c:hs_cell_build_establish_intro() 115 -problem file-size /src/feature/hs/hs_descriptor.c 3108 problem function-size /src/feature/hs/hs_descriptor.c:desc_encode_v3() 108 problem function-size /src/feature/hs/hs_descriptor.c:decrypt_desc_layer() 110 problem function-size /src/feature/hs/hs_descriptor.c:decode_introduction_point() 122 problem function-size /src/feature/hs/hs_descriptor.c:desc_decode_superencrypted_v3() 109 problem function-size /src/feature/hs/hs_descriptor.c:desc_decode_encrypted_v3() 109 -problem file-size /src/feature/dirclient/dirclient.c 3215 -problem include-count /src/feature/dirclient/dirclient.c 51 -problem function-size /src/feature/dirclient/dirclient.c:directory_get_from_dirserver() 131 -problem function-size /src/feature/dirclient/dirclient.c:directory_initiate_request() 201 -problem function-size /src/feature/dirclient/dirclient.c:directory_send_command() 241 -problem function-size /src/feature/dirclient/dirclient.c:dir_client_decompress_response_body() 114 -problem function-size /src/feature/dirclient/dirclient.c:connection_dir_client_reached_eof() 189 -problem function-size /src/feature/dirclient/dirclient.c:handle_response_fetch_consensus() 105 +problem file-size /src/feature/hs/hs_service.c 4109 +problem function-size /src/feature/keymgt/loadkey.c:ed_key_init_from_file() 333 +problem function-size /src/feature/nodelist/authcert.c:trusted_dirs_load_certs_from_string() 124 +problem function-size /src/feature/nodelist/authcert.c:authority_certs_fetch_missing() 296 +problem function-size /src/feature/nodelist/fmt_routerstatus.c:routerstatus_format_entry() 166 +problem function-size /src/feature/nodelist/microdesc.c:microdesc_cache_rebuild() 134 +problem include-count /src/feature/nodelist/networkstatus.c 61 +problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_check_consensus_signature() 176 +problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_set_current_consensus() 293 +problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_server_impl() 123 +problem function-size /src/feature/nodelist/node_select.c:compute_weighted_bandwidths() 205 +problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 114 +problem function-size /src/feature/nodelist/nodelist.c:compute_frac_paths_available() 193 +problem file-size /src/feature/nodelist/routerlist.c 3234 +problem function-size /src/feature/nodelist/routerlist.c:router_rebuild_store() 148 +problem function-size /src/feature/nodelist/routerlist.c:router_add_to_routerlist() 169 +problem function-size /src/feature/nodelist/routerlist.c:routerlist_remove_old_routers() 121 +problem function-size /src/feature/nodelist/routerlist.c:update_consensus_router_descriptor_downloads() 136 +problem function-size /src/feature/nodelist/routerlist.c:update_extrainfo_downloads() 103 +problem function-size /src/feature/relay/dns.c:dns_resolve_impl() 134 +problem function-size /src/feature/relay/dns.c:configure_nameservers() 161 +problem function-size /src/feature/relay/dns.c:evdns_callback() 109 +problem file-size /src/feature/relay/router.c 3412 +problem include-count /src/feature/relay/router.c 56 +problem function-size /src/feature/relay/router.c:init_keys() 252 +problem function-size /src/feature/relay/router.c:get_my_declared_family() 114 +problem function-size /src/feature/relay/router.c:router_build_fresh_unsigned_routerinfo() 136 +problem function-size /src/feature/relay/router.c:router_dump_router_to_string() 375 +problem function-size /src/feature/relay/router.c:extrainfo_dump_to_string() 207 +problem function-size /src/feature/relay/routerkeys.c:load_ed_keys() 294 +problem function-size /src/feature/rend/rendcache.c:rend_cache_store_v2_desc_as_client() 193 +problem function-size /src/feature/rend/rendclient.c:rend_client_send_introduction() 220 +problem function-size /src/feature/rend/rendcommon.c:rend_encode_v2_descriptors() 225 problem function-size /src/feature/rend/rendmid.c:rend_mid_establish_intro_legacy() 104 problem function-size /src/feature/rend/rendparse.c:rend_parse_v2_service_descriptor() 187 problem function-size /src/feature/rend/rendparse.c:rend_decrypt_introduction_points() 104 @@ -205,59 +256,35 @@ problem function-size /src/feature/rend/rendservice.c:rend_service_rendezvous_ha problem function-size /src/feature/rend/rendservice.c:directory_post_to_hs_dir() 108 problem function-size /src/feature/rend/rendservice.c:upload_service_descriptor() 111 problem function-size /src/feature/rend/rendservice.c:rend_consider_services_intro_points() 169 -problem function-size /src/feature/rend/rendcache.c:rend_cache_store_v2_desc_as_client() 193 -problem function-size /src/feature/rend/rendclient.c:rend_client_send_introduction() 220 -problem function-size /src/feature/rend/rendcommon.c:rend_encode_v2_descriptors() 225 -problem function-size /src/feature/nodelist/authcert.c:trusted_dirs_load_certs_from_string() 124 -problem function-size /src/feature/nodelist/authcert.c:authority_certs_fetch_missing() 296 -problem function-size /src/feature/nodelist/microdesc.c:microdesc_cache_rebuild() 134 -problem function-size /src/feature/nodelist/fmt_routerstatus.c:routerstatus_format_entry() 166 -problem include-count /src/feature/nodelist/networkstatus.c 61 -problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_check_consensus_signature() 176 -problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_set_current_consensus() 293 -problem file-size /src/feature/nodelist/routerlist.c 3234 -problem function-size /src/feature/nodelist/routerlist.c:router_rebuild_store() 148 -problem function-size /src/feature/nodelist/routerlist.c:router_add_to_routerlist() 169 -problem function-size /src/feature/nodelist/routerlist.c:routerlist_remove_old_routers() 121 -problem function-size /src/feature/nodelist/routerlist.c:update_consensus_router_descriptor_downloads() 136 -problem function-size /src/feature/nodelist/routerlist.c:update_extrainfo_downloads() 103 -problem function-size /src/feature/nodelist/nodelist.c:compute_frac_paths_available() 193 -problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_server_impl() 123 -problem function-size /src/feature/nodelist/node_select.c:compute_weighted_bandwidths() 205 -problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 114 -problem function-size /src/feature/client/dnsserv.c:evdns_server_callback() 153 -problem function-size /src/feature/client/transports.c:handle_proxy_line() 108 -problem function-size /src/feature/client/transports.c:parse_method_line_helper() 112 -problem function-size /src/feature/client/transports.c:create_managed_proxy_environment() 109 -problem function-size /src/feature/client/bridges.c:rewrite_node_address_for_bridge() 126 -problem function-size /src/feature/client/addressmap.c:addressmap_rewrite() 112 -problem file-size /src/feature/client/entrynodes.c 3817 -problem function-size /src/feature/client/entrynodes.c:entry_guards_upgrade_waiting_circuits() 153 -problem function-size /src/feature/client/entrynodes.c:entry_guard_parse_from_state() 246 -problem function-size /src/feature/client/circpathbias.c:pathbias_measure_close_rate() 108 +problem function-size /src/feature/stats/rephist.c:rep_hist_load_mtbf_data() 185 +problem function-size /src/feature/stats/rephist.c:rep_hist_format_exit_stats() 148 +problem function-size /src/lib/compress/compress.c:tor_compress_impl() 133 +problem function-size /src/lib/compress/compress_zstd.c:tor_zstd_compress_process() 126 +problem function-size /src/lib/container/smartlist.c:smartlist_bsearch_idx() 109 +problem function-size /src/lib/crypt_ops/crypto_rand.c:crypto_strongest_rand_syscall() 102 +problem function-size /src/lib/encoding/binascii.c:base64_encode() 107 +problem function-size /src/lib/encoding/confline.c:parse_config_line_from_str_verbose() 119 +problem function-size /src/lib/encoding/cstring.c:unescape_string() 108 +problem function-size /src/lib/fs/dir.c:check_private_dir() 231 problem function-size /src/lib/log/log.c:parse_log_severity_config() 101 problem function-size /src/lib/math/prob_distr.c:sample_uniform_interval() 145 +problem function-size /src/lib/net/address.c:tor_addr_parse_mask_ports() 198 +problem function-size /src/lib/net/address.c:tor_addr_compare_masked() 111 +problem function-size /src/lib/net/inaddr.c:tor_inet_pton() 107 +problem function-size /src/lib/net/resolve.c:tor_addr_lookup() 110 +problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102 +problem function-size /src/lib/osinfo/uname.c:get_uname() 116 +problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220 problem function-size /src/lib/process/process_win32.c:process_win32_exec() 138 problem function-size /src/lib/process/process_win32.c:process_win32_create_pipe() 112 -problem function-size /src/lib/process/setuid.c:switch_id() 156 problem function-size /src/lib/process/restrict.c:set_max_file_descriptors() 102 -problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220 -problem function-size /src/lib/container/smartlist.c:smartlist_bsearch_idx() 109 +problem function-size /src/lib/process/setuid.c:switch_id() 156 problem function-size /src/lib/sandbox/sandbox.c:prot_strings() 104 -problem function-size /src/lib/compress/compress_zstd.c:tor_zstd_compress_process() 126 -problem function-size /src/lib/compress/compress.c:tor_compress_impl() 133 -problem function-size /src/lib/crypt_ops/crypto_rand.c:crypto_strongest_rand_syscall() 102 problem function-size /src/lib/string/scanf.c:tor_vsscanf() 112 -problem function-size /src/lib/encoding/confline.c:parse_config_line_from_str_verbose() 119 -problem function-size /src/lib/encoding/binascii.c:base64_encode() 107 -problem function-size /src/lib/encoding/cstring.c:unescape_string() 108 +problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 147 problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 171 problem function-size /src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 126 -problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 147 -problem function-size /src/lib/osinfo/uname.c:get_uname() 116 -problem function-size /src/lib/net/address.c:tor_addr_parse_mask_ports() 198 -problem function-size /src/lib/net/address.c:tor_addr_compare_masked() 111 -problem function-size /src/lib/net/resolve.c:tor_addr_lookup() 110 -problem function-size /src/lib/net/inaddr.c:tor_inet_pton() 107 -problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102 -problem function-size /src/lib/fs/dir.c:check_private_dir() 231 +problem function-size /src/tools/tor-gencert.c:parse_commandline() 111 +problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 104 +problem function-size /src/tools/tor-resolve.c:do_resolve() 173 +problem function-size /src/tools/tor-resolve.c:main() 112

1 0

[tor/master] Merge branch 'practracker_regen'
by nickm＠torproject.org 27 Mar '19

27 Mar '19

commit 300e7d8c9946617fde3bb1d8cc9c6c8bac556220 Merge: 989b6325d 39e449434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 26 19:27:54 2019 -0400 Merge branch 'practracker_regen' Makefile.am | 3 ++ scripts/maint/practracker/practracker.py | 82 +++++++++++++++++++++++++++----- scripts/maint/practracker/problem.py | 5 +- 3 files changed, 77 insertions(+), 13 deletions(-)

1 0

[tpo/master] Removed weird unicode characters
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit c83908e2ebe04bc926fcb1dc2749e7a074fbbf92 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 22:29:43 2019 +0100 Removed weird unicode characters --- assets/static/fonts/SourceSansPro/OFL.txt | 2 +- content/about/history/contents.lr | 18 +++++++++--------- content/about/jobs/backend-engineer-ooni/contents.lr | 8 ++++---- content/about/jobs/browser-developer/contents.lr | 2 +- content/about/jobs/contents.lr | 2 +- .../about/jobs/developer-data-architect/contents.lr | 8 ++++---- .../about/jobs/senior-system-administrator/contents.lr | 8 ++++---- content/about/people/biella/contents.lr | 2 +- content/about/people/cindy/contents.lr | 2 +- content/about/people/ohmygodel/contents.lr | 2 +- content/about/people/ssteele/contents.lr | 2 +- content/about/sponsors/DARPA-nrl/contents.lr | 2 +- content/about/sponsors/DARPA-penn/contents.lr | 2 +- content/about/sponsors/USSD-DHRL-harvard/contents.lr | 2 +- content/about/sponsors/fastly/contents.lr | 2 +- content/about/sponsors/imls-ny/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 4 ++-- content/about/sponsors/nsf-rochester/contents.lr | 2 +- content/about/sponsors/sida/contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../press/blogging-where-speech-isn-t-free/contents.lr | 2 +- .../contents.lr | 2 +- content/press/contents.lr | 4 +--- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../we-can-t-outlaw-anonymous-web-services/contents.lr | 2 +- .../contents.lr | 2 +- content/thank-you/contents.lr | 2 +- templates/contact.html | 2 +- templates/download.html | 4 ++-- templates/home.html | 4 ++-- templates/jobs.html | 2 +- templates/people.html | 2 +- templates/projects.html | 2 +- 48 files changed, 68 insertions(+), 70 deletions(-) diff --git a/assets/static/fonts/SourceSansPro/OFL.txt b/assets/static/fonts/SourceSansPro/OFL.txt index 72d81ab..3e9c062 100644 --- a/assets/static/fonts/SourceSansPro/OFL.txt +++ b/assets/static/fonts/SourceSansPro/OFL.txt @@ -1,4 +1,4 @@ -Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/) with Reserved Font Name ‘Source’. +Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/) with Reserved Font Name ‘Source'. This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index d88836c..9dde452 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -12,11 +12,11 @@ title: History --- body: -The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of “onion routing” began in the mid 1990s. +The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of "onion routing" began in the mid 1990s. -**Just like Tor users, the developers, researchers, and funders who’ve made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web.** +**Just like Tor users, the developers, researchers, and funders who've made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web.** -In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1995, David Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab (NRL) asked themselves if there was a way to create internet connections that don’t reveal who is talking to whom, even to someone monitoring the network. +In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1995, David Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab (NRL) asked themselves if there was a way to create internet connections that don't reveal who is talking to whom, even to someone monitoring the network. Their answer was to create and deploy the first research designs and prototypes of onion routing. The goal of onion routing was to have a way to use the internet with as much privacy as possible, and the idea was to route traffic through multiple servers and encrypt it each step of the way. @@ -26,24 +26,24 @@ In the early 2000s, Roger Dingledine, a recent [Massachusetts Institute of Techn To distinguish this original work at NRL from other onion routing efforts that were starting to pop up elsewhere, Roger called the project Tor, which stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, joined the project soon after. From its inception in the 1990s, onion routing was conceived to rely on a decentralized network. The network needed to be operated by entities with diverse interests and trust assumptions, and the software needed to be free and open to maximize transparency and separation. -That’s why in October 2002 when the Tor network was initially deployed, its code was released under a free and open software license. +That's why in October 2002 when the Tor network was initially deployed, its code was released under a free and open software license. By the end of 2003, the network had about a dozen volunteer nodes, mostly in the U.S., plus one in Germany. -Recognizing the benefit of Tor to digital rights, the [Electronic Frontier Foundation (EFF)](https://www.eff.org/) began funding Roger's and Nick's work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded to maintain Tor’s development. +Recognizing the benefit of Tor to digital rights, the [Electronic Frontier Foundation (EFF)](https://www.eff.org/) began funding Roger's and Nick's work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded to maintain Tor's development. In 2007, the organization began developing bridges to the Tor network to address censorship, such as the need to get around government firewalls, in order for its users to access the open web. Tor began gaining popularity among activists and tech-savvy users interested in privacy, but it was still difficult for less-technically savvy people to use, so starting in 2005, development of tools beyond just the Tor proxy began. Development of Tor Browser began in [2008](https://lists.torproject.org/pipermail/tor-talk/2008-January/007837.h…. -With Tor Browser having made Tor more accessible to everyday internet users and activists, Tor was an instrumental tool during the [Arab Spring](https://www.theguardian.com/us-news/the-nsa-files) beginning in late 2010. It not only protected people’s identity online but also allowed them to access critical resources, social media, and websites which were blocked. +With Tor Browser having made Tor more accessible to everyday internet users and activists, Tor was an instrumental tool during the [Arab Spring](https://www.theguardian.com/us-news/the-nsa-files) beginning in late 2010. It not only protected people's identity online but also allowed them to access critical resources, social media, and websites which were blocked. The need for tools safeguarding against mass surveillance became a mainstream concern thanks to the [Snowden revelations in 2013](https://www.theguardian.com/us-news/the-nsa-files). -Not only was Tor instrumental to Snowden’s whistleblowing, but content of the documents also upheld assurances that, at that time, [Tor could not be cracked](https://www.wired.com/story/the-grand-tor/). +Not only was Tor instrumental to Snowden's whistleblowing, but content of the documents also upheld assurances that, at that time, [Tor could not be cracked](https://www.wired.com/story/the-grand-tor/). -People’s awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. +People's awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. Today, the network has [thousands of relays](https://metrics.torproject.org) run by volunteers and millions of users worldwide. And it is this diversity that keeps Tor users safe. -We, at the Tor Project, fight every day for everyone to have private access to an uncensored internet, and Tor has become the world’s strongest tool for privacy and freedom online. +We, at the Tor Project, fight every day for everyone to have private access to an uncensored internet, and Tor has become the world's strongest tool for privacy and freedom online. But Tor is more than just software. It is a labor of love produced by an international community of people devoted to human rights. The Tor Project is [deeply committed](https://blog.torproject.org/tor-social-contract) to transparency and the safety of its users. diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr b/content/about/jobs/backend-engineer-ooni/contents.lr index cf78f24..6a696e2 100644 --- a/content/about/jobs/backend-engineer-ooni/contents.lr +++ b/content/about/jobs/backend-engineer-ooni/contents.lr @@ -13,7 +13,7 @@ title: Backend Engineer for OONI summary: The Tor Project, Inc. is looking for a dedicated backend engineer to work on OONI (https://ooni.torproject.org/) OONI is the Open Observatory of Network Interference: a free and open source software, global observation network for detecting censorship, surveillance, and traffic manipulation on the internet. -You will be working to improve OONI’s data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments. +You will be working to improve OONI's data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments. --- description: @@ -23,7 +23,7 @@ description: The Tor Project, Inc. is looking for a dedicated backend engineer to work on OONI (https://ooni.torproject.org/) OONI is the Open Observatory of Network Interference: a free and open source software, global observation network for detecting censorship, surveillance, and traffic manipulation on the internet. -You will be working to improve OONI’s data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments. +You will be working to improve OONI's data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments. This is a full-time 12-month contract position, starting ASAP (no later than mid-May 2019); contract may be extended. @@ -42,7 +42,7 @@ Here are some of our code repositories: - Extensive experience in python or golang. - Comfortable working remotely. - Self-directed, self-disciplined, but good at working and communicating with a team. - - Have experience and be comfortable with others reviewing your code and design; have experience and be comfortable reviewing others’ code. + - Have experience and be comfortable with others reviewing your code and design; have experience and be comfortable reviewing others' code. - Experience documenting and designing protocols. - Be comfortable with transparency! @@ -76,6 +76,6 @@ Email should be sent to jobs at openobservatory dot org with "OONI Backend Engin The Open Observatory of Network Interference (OONI) is a free software project under the Tor Project. OONI collects and processes network measurements with the aim of detecting network interferences, such as censorship, surveillance, and traffic manipulation. Since late 2012, OONI has collected millions of measurements across more than 90 countries around the world. -The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle with paid staff and contractors of around 45 engineers and operational support people, plus many volunteers all over the world. Tor develops free and open source software for privacy and freedom online, protecting people from tracking, surveillance, and censorship. The Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. The Tor Project’s mission is to advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, support their unrestricted availability and use, and further their scientific and popular understanding. +The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle with paid staff and contractors of around 45 engineers and operational support people, plus many volunteers all over the world. Tor develops free and open source software for privacy and freedom online, protecting people from tracking, surveillance, and censorship. The Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. The Tor Project's mission is to advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, support their unrestricted availability and use, and further their scientific and popular understanding. The Tor Project, Inc., is an equal opportunity, affirmative action employer. diff --git a/content/about/jobs/browser-developer/contents.lr b/content/about/jobs/browser-developer/contents.lr index 6961dd6..c82e51b 100644 --- a/content/about/jobs/browser-developer/contents.lr +++ b/content/about/jobs/browser-developer/contents.lr @@ -71,6 +71,6 @@ Email should be sent to job-browser at torproject.org with "Browser Developer" i Link to at least one of your code samples (ideally, more than one and all of which we will presume you are authorized to disclose). No phone calls, please! About the Organization: -The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle with paid staff and contractors of around 45 engineers and operational support people, plus many volunteers all over the world. Tor develops free and open source software for privacy and freedom online, protecting people from tracking, surveillance, and censorship. The Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. The Tor Project’s mission is to advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, support their unrestricted availability and use, and further their scientific and popular understanding. +The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle with paid staff and contractors of around 45 engineers and operational support people, plus many volunteers all over the world. Tor develops free and open source software for privacy and freedom online, protecting people from tracking, surveillance, and censorship. The Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. The Tor Project's mission is to advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, support their unrestricted availability and use, and further their scientific and popular understanding. The Tor Project, Inc., is an equal opportunity, affirmative action employer. diff --git a/content/about/jobs/contents.lr b/content/about/jobs/contents.lr index 7114a31..63e1d9a 100644 --- a/content/about/jobs/contents.lr +++ b/content/about/jobs/contents.lr @@ -14,4 +14,4 @@ title: Jobs --- body: -We’re always looking for more great people to join our team. Join us in our Seattle office or work remotely from wherever you are in the world. You’ll work with a diverse group of bright and passionate folks committed to fostering internet freedom worldwide. +We're always looking for more great people to join our team. Join us in our Seattle office or work remotely from wherever you are in the world. You'll work with a diverse group of bright and passionate folks committed to fostering internet freedom worldwide. diff --git a/content/about/jobs/developer-data-architect/contents.lr b/content/about/jobs/developer-data-architect/contents.lr index 8228fda..d3ec5e0 100644 --- a/content/about/jobs/developer-data-architect/contents.lr +++ b/content/about/jobs/developer-data-architect/contents.lr @@ -18,7 +18,7 @@ Internet Freedom Nonprofit Seeks Metrics Data Architect The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking an experienced Data Architect to take our metrics work to the next level. -Tor is for everyone, and we are actively working to build a team that represents people from all over the world — people from diverse ethnic, national, and cultural backgrounds; people from all walks of life. +Tor is for everyone, and we are actively working to build a team that represents people from all over the world - people from diverse ethnic, national, and cultural backgrounds; people from all walks of life. Racial minorities, non-gender-binary people, women, and people from any group that is generally underrepresented in tech are encouraged to apply. The team: @@ -34,7 +34,7 @@ How we achieve our goals: * Scalability (as the network grows, so does our data) * Transparency (our community rightly wants to know what data we're collecting) -The Tor Metrics team presently consists of two full-time developers; this position will be the third. Our team works asynchronously on each person’s own schedule, but we sync regularly via Git, Trac, IRC, e-mail, and an occasional video chat. +The Tor Metrics team presently consists of two full-time developers; this position will be the third. Our team works asynchronously on each person's own schedule, but we sync regularly via Git, Trac, IRC, e-mail, and an occasional video chat. The most interesting challenge for the Metrics team is how to gather data on an anonymity system without de-anonymizing users. @@ -77,10 +77,10 @@ Bonus skills: * Networking background: Experience working with networks and measurements in the past. * You support Internet Freedom! -This is a full-time position that can be done remotely/internationally or in our office in Seattle, WA. To apply, send a cover letter that includes a statement about why you want to work at the Tor Project, your CV/resume (including three professional references), and a link to a code sample or some non-trivial software project you have significantly contributed to. All documents should be in PDF format labeled with your name. Please send to job-metrics at torproject dot org with “Metrics Data Architect” in the subject line. No phone calls please! +This is a full-time position that can be done remotely/internationally or in our office in Seattle, WA. To apply, send a cover letter that includes a statement about why you want to work at the Tor Project, your CV/resume (including three professional references), and a link to a code sample or some non-trivial software project you have significantly contributed to. All documents should be in PDF format labeled with your name. Please send to job-metrics at torproject dot org with "Metrics Data Architect" in the subject line. No phone calls please! Flexible salary, depending on experience. The Tor Project has a highly competitive benefits package, including a generous PTO policy; paid holidays (including the week between Christmas and New Year's, when the office is closed); health, vision, dental, disability, and life insurance paid in full for employee; 401(k); and flexible work schedule. (Please note that benefits package specifics can vary slightly from country to country, but we aim to treat everyone equally.) -The Tor Project's workforce is smart and committed. The Tor Project currently has a paid and contract staff of around 47 developers and operational support staff, plus many thousands of volunteers who contribute to our work. The Tor Project is funded in part by government research and development grants, and in part by individual, foundation and corporate donations. If you’re new to the Tor Project scene, are curious what our workplace culture is like, or just want to read about how fun our semi-annual meetings are, hear what our new Development Director had to say about all of it: https://blog.torproject.org/reflections-tor-meeting-newbie. +The Tor Project's workforce is smart and committed. The Tor Project currently has a paid and contract staff of around 47 developers and operational support staff, plus many thousands of volunteers who contribute to our work. The Tor Project is funded in part by government research and development grants, and in part by individual, foundation and corporate donations. If you're new to the Tor Project scene, are curious what our workplace culture is like, or just want to read about how fun our semi-annual meetings are, hear what our new Development Director had to say about all of it: https://blog.torproject.org/reflections-tor-meeting-newbie. The Tor Project, Inc., is an equal opportunity, affirmative action employer. diff --git a/content/about/jobs/senior-system-administrator/contents.lr b/content/about/jobs/senior-system-administrator/contents.lr index b2d9fb2..1598dae 100644 --- a/content/about/jobs/senior-system-administrator/contents.lr +++ b/content/about/jobs/senior-system-administrator/contents.lr @@ -15,8 +15,8 @@ summary: Internet Freedom Nonprofit Seeks Senior Systems Administrator (Posted July 25, 2018) -The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking a Senior Systems Administrator to maintain, upgrade and manage our organization’s software, hardware, and networks. -The goal of the Tor Project’s sysadmin will be to ensure that our technology infrastructure runs securely, smoothly, and efficiently and that Tor Project employees, contractors, and volunteers have the knowledge and resources to do their work. +The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking a Senior Systems Administrator to maintain, upgrade and manage our organization's software, hardware, and networks. +The goal of the Tor Project's sysadmin will be to ensure that our technology infrastructure runs securely, smoothly, and efficiently and that Tor Project employees, contractors, and volunteers have the knowledge and resources to do their work. The ideal candidate is resourceful, creative, and able to diagnose and resolve problems quickly. Our sysadmin must have the patience to communicate with a variety of interdisciplinary teams and users, including some who are not technical and others who are extremely technical. @@ -27,9 +27,9 @@ This job requires a jack-of-all-trades, and every day is likely to present new a description: The ideal candidate will have at least five years of experience running open source systems. -This is a senior level position that reports directly to the Executive Director and is part of the organization’s leadership team. +This is a senior level position that reports directly to the Executive Director and is part of the organization's leadership team. This person will manage one direct report, our Junior Services Administrator. -This will be the organization’s first paid sysadmin, and a willingness to work with our highly effective, long-term volunteer sysadmins is essential. +This will be the organization's first paid sysadmin, and a willingness to work with our highly effective, long-term volunteer sysadmins is essential. Responsibilities: diff --git a/content/about/people/biella/contents.lr b/content/about/people/biella/contents.lr index 86d6069..42297bf 100644 --- a/content/about/people/biella/contents.lr +++ b/content/about/people/biella/contents.lr @@ -16,5 +16,5 @@ description: Gabriella holds the Wolfe Chair in Scientific and Technological Literacy at McGill University. Trained as an anthropologist, her scholarship explores the intersection of the cultures of hacking and politics. -She has authored two books, Coding Freedom: The Ethics and Aesthetics of Hacking (Princeton University Press, 2012) and Hacker, Hoaxer, Whistleblower, Spy: The Many Faces of Anonymous (Verso, 2014), which was named to Kirkus Reviews’ Best Books of 2014 and was awarded the Diana Forsythe Prize by the American Anthropological Association. +She has authored two books, Coding Freedom: The Ethics and Aesthetics of Hacking (Princeton University Press, 2012) and Hacker, Hoaxer, Whistleblower, Spy: The Many Faces of Anonymous (Verso, 2014), which was named to Kirkus Reviews' Best Books of 2014 and was awarded the Diana Forsythe Prize by the American Anthropological Association. She has written for popular media outlets, including the New York Times, Slate, Wired, MIT Technology Review, Huffington Post, and the Atlantic. diff --git a/content/about/people/cindy/contents.lr b/content/about/people/cindy/contents.lr index 410482d..e967068 100644 --- a/content/about/people/cindy/contents.lr +++ b/content/about/people/cindy/contents.lr @@ -13,6 +13,6 @@ nickname: cindy description: Cindy is the Executive Director of the Electronic Frontier Foundation (EFF). -From 2000 to 2015 she served as EFF’s Legal Director as well as its General Counsel. +From 2000 to 2015 she served as EFF's Legal Director as well as its General Counsel. Cindy first became involved with EFF in 1993, when EFF asked her to serve as the outside lead attorney in Bernstein v. Dept. of Justice, the successful First Amendment challenge to the U.S. export restrictions on cryptography. Ms. Cohn works to ensure that people around the world have the right to access information and communicate privately and anonymously, including mounting lawsuits against NSA spying, providing legal counsel to computer programmers building and developing privacy and anonymity tools, and helping to develop the Necessary and Proportionate Principles applying international human rights standards to digital communications surveillance. diff --git a/content/about/people/ohmygodel/contents.lr b/content/about/people/ohmygodel/contents.lr index fd00f4b..4168618 100644 --- a/content/about/people/ohmygodel/contents.lr +++ b/content/about/people/ohmygodel/contents.lr @@ -16,4 +16,4 @@ image: /static/images/people/ohmygodel.png --- description: -NRL researcher in applied cryptography with an interest in Tor’s security and privacy. +NRL researcher in applied cryptography with an interest in Tor's security and privacy. diff --git a/content/about/people/ssteele/contents.lr b/content/about/people/ssteele/contents.lr index 2cf156f..10a1e94 100644 --- a/content/about/people/ssteele/contents.lr +++ b/content/about/people/ssteele/contents.lr @@ -14,4 +14,4 @@ description: Shari Steele was the Executive Director of the Tor Project from December 2015 through December 2018. She came to Tor after serving as Executive Director of the Electronic Frontier Foundation (EFF) for 15 years. From 1992 to 2000, Shari worked as an attorney and then legal director at EFF, where she spoke widely about civil liberties law in newly emerging technologies. -A graduate of Widener University School of Law, Shari later served as a teaching fellow at [Georgetown University Law Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor Project Board of Directors since January 2019. +A graduate of Widener University School of Law, Shari later served as a teaching fellow at [Georgetown University Law Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree in Advocacy. Shari has been on EFF's Board of Directors since 2000 and the Tor Project Board of Directors since January 2019. diff --git a/content/about/sponsors/DARPA-nrl/contents.lr b/content/about/sponsors/DARPA-nrl/contents.lr index 88ea349..36dbffd 100644 --- a/content/about/sponsors/DARPA-nrl/contents.lr +++ b/content/about/sponsors/DARPA-nrl/contents.lr @@ -14,4 +14,4 @@ link: https://www.darpa.mil/program/extreme-ddos-defense --- description: -DARPA’s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks by: (1) dispersing cyber assets (physically and/or logically) to complicate adversarial targeting; (2) disguising the characteristics and behaviors of those assets through networked maneuver to confuse or deceive the adversary; and (3) using adaptive mitigation techniques on endpoints (e.g., mission-critical servers) to blunt the effects of attacks that succeed in penetrating other defensive measures. +DARPA's Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks by: (1) dispersing cyber assets (physically and/or logically) to complicate adversarial targeting; (2) disguising the characteristics and behaviors of those assets through networked maneuver to confuse or deceive the adversary; and (3) using adaptive mitigation techniques on endpoints (e.g., mission-critical servers) to blunt the effects of attacks that succeed in penetrating other defensive measures. diff --git a/content/about/sponsors/DARPA-penn/contents.lr b/content/about/sponsors/DARPA-penn/contents.lr index 78ea646..1916f4d 100644 --- a/content/about/sponsors/DARPA-penn/contents.lr +++ b/content/about/sponsors/DARPA-penn/contents.lr @@ -16,4 +16,4 @@ link: https://www.darpa.mil/program/extreme-ddos-defense --- description: -DARPA’s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This grant supports our work addressing denial of service attacks on free and open communication on the internet. +DARPA's Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This grant supports our work addressing denial of service attacks on free and open communication on the internet. diff --git a/content/about/sponsors/USSD-DHRL-harvard/contents.lr b/content/about/sponsors/USSD-DHRL-harvard/contents.lr index 4820c17..7433b91 100644 --- a/content/about/sponsors/USSD-DHRL-harvard/contents.lr +++ b/content/about/sponsors/USSD-DHRL-harvard/contents.lr @@ -16,4 +16,4 @@ link: https://www.state.gov/j/drl/ --- description: -The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to promote democracy, protect human rights and international religious freedom, and advance labor rights globally. This funding is being used by Tor’s OONI team to work toward creating a system that provides real-time measurement of online censorship. +The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to promote democracy, protect human rights and international religious freedom, and advance labor rights globally. This funding is being used by Tor's OONI team to work toward creating a system that provides real-time measurement of online censorship. diff --git a/content/about/sponsors/fastly/contents.lr b/content/about/sponsors/fastly/contents.lr index c93eba9..360a9f2 100644 --- a/content/about/sponsors/fastly/contents.lr +++ b/content/about/sponsors/fastly/contents.lr @@ -15,5 +15,5 @@ _hidden: yes link: https://www.fastly.com/ --- description: -Fastly’s global edge cloud platform processes, serves, and secures applications as close to users as possible, at the edge of the network. +Fastly's global edge cloud platform processes, serves, and secures applications as close to users as possible, at the edge of the network. Fastly generously hosts our Tor Browser update downloads that can be fetched anonymously. diff --git a/content/about/sponsors/imls-ny/contents.lr b/content/about/sponsors/imls-ny/contents.lr index a77bef8..a4927c1 100644 --- a/content/about/sponsors/imls-ny/contents.lr +++ b/content/about/sponsors/imls-ny/contents.lr @@ -16,4 +16,4 @@ link: https://www.imls.gov/ --- description: -Institute of Museum and Library Services advances, supports, and empowers America's museums, libraries, and related organizations through grantmaking, research, and policy development. This grant helps fund Tor’s affiliate project, Library Freedom Institute, which advances the use of practical privacy tools in libraries and their communities through the development of a privacy-focused train-the-trainer program for librarians. +Institute of Museum and Library Services advances, supports, and empowers America's museums, libraries, and related organizations through grantmaking, research, and policy development. This grant helps fund Tor's affiliate project, Library Freedom Institute, which advances the use of practical privacy tools in libraries and their communities through the development of a privacy-focused train-the-trainer program for librarians. diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr index 4ef064e..69835dc 100644 --- a/content/about/sponsors/mozilla/contents.lr +++ b/content/about/sponsors/mozilla/contents.lr @@ -16,5 +16,5 @@ link: https://www.mozilla.org/en-US/moss/ --- description: -Mozilla’s mission is to ensure the Internet is a global public resource, open and accessible to all. -Several grants from Mozilla, including the Mozilla Open Source Support (MOSS) awards program, helped with the following projects: maintaining TorBirdy, a plugin to connect your email client Thunderbird with Tor; modularization of Tor network codebase making it more accessible, faster, and easier to adopt; significant improvements to OONI Explorer; Open Web Fellowship; Glass Room exhibit; and Mozilla’s year-end matching funds that help all of Tor’s important work. +Mozilla's mission is to ensure the Internet is a global public resource, open and accessible to all. +Several grants from Mozilla, including the Mozilla Open Source Support (MOSS) awards program, helped with the following projects: maintaining TorBirdy, a plugin to connect your email client Thunderbird with Tor; modularization of Tor network codebase making it more accessible, faster, and easier to adopt; significant improvements to OONI Explorer; Open Web Fellowship; Glass Room exhibit; and Mozilla's year-end matching funds that help all of Tor's important work. diff --git a/content/about/sponsors/nsf-rochester/contents.lr b/content/about/sponsors/nsf-rochester/contents.lr index a26f278..381b7e9 100644 --- a/content/about/sponsors/nsf-rochester/contents.lr +++ b/content/about/sponsors/nsf-rochester/contents.lr @@ -16,4 +16,4 @@ link: https://nsf.gov/ --- description: -The National Science Foundation funds research and education in most fields of science and engineering. We’re using this grant to improve our defense of website fingerprinting in Tor. +The National Science Foundation funds research and education in most fields of science and engineering. We're using this grant to improve our defense of website fingerprinting in Tor. diff --git a/content/about/sponsors/sida/contents.lr b/content/about/sponsors/sida/contents.lr index 21465c0..cc4548b 100644 --- a/content/about/sponsors/sida/contents.lr +++ b/content/about/sponsors/sida/contents.lr @@ -17,4 +17,4 @@ link: https://www.sida.se/English/ description: Sida is a government agency working on behalf of the Swedish parliament and government, with the mission to reduce poverty in the world. -Through their work and in cooperation with others, Sida contributes to implementing Sweden’s Policy for Global Development. +Through their work and in cooperation with others, Sida contributes to implementing Sweden's Policy for Global Development. diff --git a/content/press/2-5-million-tor-users-can-t-all-be-criminals/contents.lr b/content/press/2-5-million-tor-users-can-t-all-be-criminals/contents.lr index 9df1013..da62520 100644 --- a/content/press/2-5-million-tor-users-can-t-all-be-criminals/contents.lr +++ b/content/press/2-5-million-tor-users-can-t-all-be-criminals/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: AFP --- title: -2.5 million Tor users can’t all be criminals! +2.5 million Tor users can't all be criminals! --- link: http://fr.canoe.ca/techno/internet/archives/2015/03/20150303-125006.html --- diff --git a/content/press/activists-vow-to-defeat-iran-s-internet-censorship/contents.lr b/content/press/activists-vow-to-defeat-iran-s-internet-censorship/contents.lr index 8b4917e..44f1a13 100644 --- a/content/press/activists-vow-to-defeat-iran-s-internet-censorship/contents.lr +++ b/content/press/activists-vow-to-defeat-iran-s-internet-censorship/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: GigaOM --- -title: Activists vow to defeat Iran’s Internet censorship +title: Activists vow to defeat Iran's Internet censorship --- link: http://gigaom.com/2012/02/27/iran-elections-censorship-tor-balatarin/ --- diff --git a/content/press/blogging-where-speech-isn-t-free/contents.lr b/content/press/blogging-where-speech-isn-t-free/contents.lr index ffc852f..b099cb7 100644 --- a/content/press/blogging-where-speech-isn-t-free/contents.lr +++ b/content/press/blogging-where-speech-isn-t-free/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: World Changing --- title: -Blogging Where Speech Isn’t Free +Blogging Where Speech Isn't Free --- link: http://www.worldchanging.com/archives/006309.html --- diff --git a/content/press/china-rights-forum-no-2-china-s-internet-staking-digital-ground/contents.lr b/content/press/china-rights-forum-no-2-china-s-internet-staking-digital-ground/contents.lr index 9f9fdd5..47c8e7e 100644 --- a/content/press/china-rights-forum-no-2-china-s-internet-staking-digital-ground/contents.lr +++ b/content/press/china-rights-forum-no-2-china-s-internet-staking-digital-ground/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: China Rights Forum --- -title: China Rights Forum, No. 2 - “China’s Internet”: Staking Digital Ground +title: China Rights Forum, No. 2 - “China's Internet”: Staking Digital Ground --- link: http://www.hrichina.org/public/contents/category?cid=175033 --- diff --git a/content/press/contents.lr b/content/press/contents.lr index ecf28a5..b993636 100644 --- a/content/press/contents.lr +++ b/content/press/contents.lr @@ -16,6 +16,4 @@ color: primary --- title: Press --- -body: - -Email inquiries to press(a)torproject.org. +body: Email inquiries to press(a)torproject.org. diff --git a/content/press/doj-s-ovie-carroll-tor-helps-protect-sensitive-user-information/contents.lr b/content/press/doj-s-ovie-carroll-tor-helps-protect-sensitive-user-information/contents.lr index 32462de..992686a 100644 --- a/content/press/doj-s-ovie-carroll-tor-helps-protect-sensitive-user-information/contents.lr +++ b/content/press/doj-s-ovie-carroll-tor-helps-protect-sensitive-user-information/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: The Merkle --- title: -DOJ’s Ovie Carroll: “Tor Helps Protect Sensitive User Information” +DOJ's Ovie Carroll: “Tor Helps Protect Sensitive User Information” --- link: http://themerkle.com/dojs-ovie-carroll-tor-helps-protect-sensitive-user-inf… --- diff --git a/content/press/don-t-panic-tor-is-still-safe-and-here-s-why/contents.lr b/content/press/don-t-panic-tor-is-still-safe-and-here-s-why/contents.lr index bf4acc5..47ffb3b 100644 --- a/content/press/don-t-panic-tor-is-still-safe-and-here-s-why/contents.lr +++ b/content/press/don-t-panic-tor-is-still-safe-and-here-s-why/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Wired.co.UK --- title: -Don't panic, Tor is still safe and Here’s Why +Don't panic, Tor is still safe and Here's Why --- link: http://www.wired.co.uk/news/archive/2014-11/20/tor-still-secure --- diff --git a/content/press/facebook-helps-tor-s-hidden-sites-get-official-recognition/contents.lr b/content/press/facebook-helps-tor-s-hidden-sites-get-official-recognition/contents.lr index 6f78ab3..2efa176 100644 --- a/content/press/facebook-helps-tor-s-hidden-sites-get-official-recognition/contents.lr +++ b/content/press/facebook-helps-tor-s-hidden-sites-get-official-recognition/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: The Verge --- -title: Facebook helps Tor’s hidden sites get official recognition +title: Facebook helps Tor's hidden sites get official recognition --- link: http://www.theverge.com/2015/10/28/9631006/tor-hidden-addresses-recognition --- diff --git a/content/press/fbi-s-tor-vpntargeted-warrants-amount-to-court-sanctioned-mass-surveillance/contents.lr b/content/press/fbi-s-tor-vpntargeted-warrants-amount-to-court-sanctioned-mass-surveillance/contents.lr index a4e99ca..e765134 100644 --- a/content/press/fbi-s-tor-vpntargeted-warrants-amount-to-court-sanctioned-mass-surveillance/contents.lr +++ b/content/press/fbi-s-tor-vpntargeted-warrants-amount-to-court-sanctioned-mass-surveillance/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: The Mac Observer --- -title: FBI’s TOR, VPNtargeted Warrants Amount to Court Sanctioned Mass Surveillance +title: FBI's TOR, VPNtargeted Warrants Amount to Court Sanctioned Mass Surveillance --- link: https://www.macobserver.com/tmo/article/fbis-tor-vpn-targeted-warrants-amou… --- diff --git a/content/press/five-tools-for-journalists-online-safety-privacy-highlighted-during-aaron-swartz-day-event/contents.lr b/content/press/five-tools-for-journalists-online-safety-privacy-highlighted-during-aaron-swartz-day-event/contents.lr index a9ba8a1..b58b9ae 100644 --- a/content/press/five-tools-for-journalists-online-safety-privacy-highlighted-during-aaron-swartz-day-event/contents.lr +++ b/content/press/five-tools-for-journalists-online-safety-privacy-highlighted-during-aaron-swartz-day-event/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: International Journalists Network (IJNet) --- -title: Five tools for journalists’ online safety, privacy highlighted during Aaron Swartz Day event +title: Five tools for journalists' online safety, privacy highlighted during Aaron Swartz Day event --- link: https://ijnet.org/en/blog/five-tools-journalists%E2%80%99-online-safety-pri… --- diff --git a/content/press/how-this-west-philly-activist-became-tor-s-first-director-of-communications/contents.lr b/content/press/how-this-west-philly-activist-became-tor-s-first-director-of-communications/contents.lr index 510d009..ef1a5bf 100644 --- a/content/press/how-this-west-philly-activist-became-tor-s-first-director-of-communications/contents.lr +++ b/content/press/how-this-west-philly-activist-became-tor-s-first-director-of-communications/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: Technically Philly --- -title: How this West Philly activist became Tor’s first director of communications +title: How this West Philly activist became Tor's first director of communications --- link: https://technical.ly/philly/2015/07/16/kate-krauss-tor/ --- diff --git a/content/press/inside-philly-s-growing-internet-privacy-community/contents.lr b/content/press/inside-philly-s-growing-internet-privacy-community/contents.lr index c3580f1..517461d 100644 --- a/content/press/inside-philly-s-growing-internet-privacy-community/contents.lr +++ b/content/press/inside-philly-s-growing-internet-privacy-community/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: Technically Philly --- -title: Inside Philly’s Growing Internet Privacy Community +title: Inside Philly's Growing Internet Privacy Community --- link: https://technical.ly/philly/2015/07/08/philadelphia-internet-privacy-tor/ --- diff --git a/content/press/make-it-harder-for-the-gov-t-to-track-your-shutdownzimbabwe2016-messages/contents.lr b/content/press/make-it-harder-for-the-gov-t-to-track-your-shutdownzimbabwe2016-messages/contents.lr index e8664f5..a67ca8f 100644 --- a/content/press/make-it-harder-for-the-gov-t-to-track-your-shutdownzimbabwe2016-messages/contents.lr +++ b/content/press/make-it-harder-for-the-gov-t-to-track-your-shutdownzimbabwe2016-messages/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: http://www.htxt. co.za/ --- title: -Make it harder for the gov’t to track your #ShutdownZimbabwe2016 messages +Make it harder for the gov't to track your #ShutdownZimbabwe2016 messages --- link: http://www.htxt.co.za/2016/07/07/make-it-harder-for-the-govt-to-track-your-… --- diff --git a/content/press/mapping-how-tor-s-anonymity-network-spread-around-the-world/contents.lr b/content/press/mapping-how-tor-s-anonymity-network-spread-around-the-world/contents.lr index a6ff88f..bfc06ae 100644 --- a/content/press/mapping-how-tor-s-anonymity-network-spread-around-the-world/contents.lr +++ b/content/press/mapping-how-tor-s-anonymity-network-spread-around-the-world/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Wired --- title: -Mapping How Tor’s Anonymity Network Spread Around the World +Mapping How Tor's Anonymity Network Spread Around the World --- link: http://www.wired.com/2015/09/mapping-tors-anonymity-network-spread-around-w… --- diff --git a/content/press/propublica-launches-the-dark-web-s-first-major-news-site/contents.lr b/content/press/propublica-launches-the-dark-web-s-first-major-news-site/contents.lr index 8264f4d..3361fdb 100644 --- a/content/press/propublica-launches-the-dark-web-s-first-major-news-site/contents.lr +++ b/content/press/propublica-launches-the-dark-web-s-first-major-news-site/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Wired --- title: -ProPublica Launches the Dark Web’s First Major News Site +ProPublica Launches the Dark Web's First Major News Site --- link: https://www.wired.com/2016/01/propublica-launches-the-dark-webs-first-major… --- diff --git a/content/press/security-and-privacy-on-the-internet-with-julia-angwen-and-tor-project-s-kate-krauss-starts-at-13-30/contents.lr b/content/press/security-and-privacy-on-the-internet-with-julia-angwen-and-tor-project-s-kate-krauss-starts-at-13-30/contents.lr index 0529fda..172b273 100644 --- a/content/press/security-and-privacy-on-the-internet-with-julia-angwen-and-tor-project-s-kate-krauss-starts-at-13-30/contents.lr +++ b/content/press/security-and-privacy-on-the-internet-with-julia-angwen-and-tor-project-s-kate-krauss-starts-at-13-30/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: WHYY Radio --- title: -Security and Privacy on the Internet, with Julia Angwen and Tor Project’s Kate Krauss (starts at 13:30) +Security and Privacy on the Internet, with Julia Angwen and Tor Project's Kate Krauss (starts at 13:30) --- link: https://technical.ly/philly/2015/07/24/kate-krauss-radio-times/ --- diff --git a/content/press/tor-is-software-for-keeping-things-online-anonymous/contents.lr b/content/press/tor-is-software-for-keeping-things-online-anonymous/contents.lr index 5338432..2fe6090 100644 --- a/content/press/tor-is-software-for-keeping-things-online-anonymous/contents.lr +++ b/content/press/tor-is-software-for-keeping-things-online-anonymous/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Statesman --- title: -‘Tor’ is software for keeping things online anonymous +‘Tor' is software for keeping things online anonymous --- link: http://www.statesman.com/news/technology/tor-is-software-for-keeping-things… --- diff --git a/content/press/tor-project-is-tapping-amazon-s-ec2-cloud-service/contents.lr b/content/press/tor-project-is-tapping-amazon-s-ec2-cloud-service/contents.lr index d3a5b45..5710ef2 100644 --- a/content/press/tor-project-is-tapping-amazon-s-ec2-cloud-service/contents.lr +++ b/content/press/tor-project-is-tapping-amazon-s-ec2-cloud-service/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: IT Security Belgium --- -title: Tor Project is tapping Amazon’s EC2 cloud service +title: Tor Project is tapping Amazon's EC2 cloud service --- link: http://www.itsecurity.be/tor-project-is-tapping-amazons-ec2-cloud-service --- diff --git a/content/press/tor-s-new-social-contract-includes-no-backdoors-pledge/contents.lr b/content/press/tor-s-new-social-contract-includes-no-backdoors-pledge/contents.lr index cfeaed6..a6ac958 100644 --- a/content/press/tor-s-new-social-contract-includes-no-backdoors-pledge/contents.lr +++ b/content/press/tor-s-new-social-contract-includes-no-backdoors-pledge/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: TechCrunch --- -title: Tor’s new social contract includes ‘no backdoors’ pledge +title: Tor's new social contract includes ‘no backdoors' pledge --- link: https://techcrunch.com/2016/08/10/tors-new-social-contract-includes-no-back… --- diff --git a/content/press/u-s-cloud-providers-face-backlash-from-china-s-censors/contents.lr b/content/press/u-s-cloud-providers-face-backlash-from-china-s-censors/contents.lr index 741ba0b..538a262 100644 --- a/content/press/u-s-cloud-providers-face-backlash-from-china-s-censors/contents.lr +++ b/content/press/u-s-cloud-providers-face-backlash-from-china-s-censors/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Wall Street Journal --- title: -U.S. Cloud Providers Face Backlash From China’s Censors +U.S. Cloud Providers Face Backlash From China's Censors --- link: http://www.wsj.com/articles/u-s-cloud-providers-face-backlash-from-chinas-c… --- diff --git a/content/press/we-can-t-outlaw-anonymous-web-services/contents.lr b/content/press/we-can-t-outlaw-anonymous-web-services/contents.lr index e67a404..c5929b9 100644 --- a/content/press/we-can-t-outlaw-anonymous-web-services/contents.lr +++ b/content/press/we-can-t-outlaw-anonymous-web-services/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: The Hill --- -title: We Can’t Outlaw Anonymous Web Services +title: We Can't Outlaw Anonymous Web Services --- link: https://thehill.com/policy/cybersecurity/235171-uk-lawmakers-we-cant-ban-on… --- diff --git a/content/press/when-iran-s-regime-falls-this-will-be-remembered-as-the-youtube-revolution/contents.lr b/content/press/when-iran-s-regime-falls-this-will-be-remembered-as-the-youtube-revolution/contents.lr index 9b62679..76c855d 100644 --- a/content/press/when-iran-s-regime-falls-this-will-be-remembered-as-the-youtube-revolution/contents.lr +++ b/content/press/when-iran-s-regime-falls-this-will-be-remembered-as-the-youtube-revolution/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: Times Online --- -title: When Iran’s regime falls this will be remembered as the YouTube revolution +title: When Iran's regime falls this will be remembered as the YouTube revolution --- link: http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece --- diff --git a/content/thank-you/contents.lr b/content/thank-you/contents.lr index 3ba1f1e..c0e4058 100644 --- a/content/thank-you/contents.lr +++ b/content/thank-you/contents.lr @@ -12,7 +12,7 @@ title: Success --- body: -You’re equipped to browse freely. +You're equipped to browse freely. Tor is the strongest tool for privacy and freedom online. It is free and open source software maintained by the Tor Project and a community of volunteers worldwide. We need your help to keep Tor secure and safe for millions across the globe. [Donate Now](https://donate.torproject.org/) diff --git a/templates/contact.html b/templates/contact.html index 187b6c0..4973b6e 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -11,7 +11,7 @@ <p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, translation, or website improvements.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-meeting</span> - {{ _("Watch or join publicly logged team meetings.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-relays</span> - {{ _("Discuss running a Tor relay.") }}</p> - <p class="text-tpo"><span class="text-primary nick">#tor-south</span> - {{ _("Talk with Tor’s global south community.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-south</span> - {{ _("Talk with Tor's global south community.") }}</p> </div> <div class="d-block d-sm-none container py-3"> <div class="row border-bottom border-light"><p></p></div> diff --git a/templates/download.html b/templates/download.html index 48f0b53..d27d14b 100644 --- a/templates/download.html +++ b/templates/download.html @@ -10,8 +10,8 @@ <p class="text-tpo">{{ _('Select "Tor is censored in my country."') }}</p> </div> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won’t connect is an incorrect system clock. Please make sure it’s set correctly.') }}</p> - <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ’s at our Support Portal') }}</a></h6> + <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won\'t connect is an incorrect system clock. Please make sure it\'s set correctly.') }}</p> + <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ\'s at our Support Portal') }}</a></h6> </div> </div> <div class="col-sm-6"> diff --git a/templates/home.html b/templates/home.html index 1e700d1..befd710 100644 --- a/templates/home.html +++ b/templates/home.html @@ -9,7 +9,7 @@ <div class="col-md-7 px-3 order-2"> <div class="card-block px-3 py-5"> <h4 class="pt-3 card-title text-primary">{{ _("BLOCK TRACKERS") }}</h4> - <p class="card-text">{{ _("Tor Browser isolates each website you visit so third-party trackers and ads can’t follow you. Any cookies automatically clear when you’re done browsing. So will your browsing history.") }}</p> + <p class="card-text">{{ _("Tor Browser isolates each website you visit so third-party trackers and ads can't follow you. Any cookies automatically clear when you're done browsing. So will your browsing history.") }}</p> </div> </div> </div> @@ -26,7 +26,7 @@ <div class="col-md-7 px-3 order-md-1"> <div class="card-block px-3 py-5"> <h4 class="pt-3 card-title text-primary">{{ _("DEFEND AGAINST SURVEILLANCE") }}</h4> - <p class="card-text">{{ _("Tor Browser prevents someone watching your connection from knowing what websites you visit. All anyone monitoring your browsing habits can see is that you’re using Tor.") }}</p> + <p class="card-text">{{ _("Tor Browser prevents someone watching your connection from knowing what websites you visit. All anyone monitoring your browsing habits can see is that you're using Tor.") }}</p> </div> </div> </div> diff --git a/templates/jobs.html b/templates/jobs.html index 90bc86f..3e948ca 100644 --- a/templates/jobs.html +++ b/templates/jobs.html @@ -25,6 +25,6 @@ </div> </div> <div class="row"> - <p>{{ _("Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="/contact">{{ _("We invite you to join us on IRC to find how you can get involved.") }}</a></p> + <p>{{ _("Think you could help us in a position that's not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="/contact">{{ _("We invite you to join us on IRC to find how you can get involved.") }}</a></p> </div> </div> diff --git a/templates/people.html b/templates/people.html index 2ce698f..fba0466 100644 --- a/templates/people.html +++ b/templates/people.html @@ -26,7 +26,7 @@ <div class="container p-3 col-6"> <div class="row justify-content-center"> <h4 class="text-primary display-5">{{ _('Join Our Team') }}</h4> - <p class="text-center">{{ _("Even if we aren’t hiring, you can contribute to Tor. We are open to ideas and studies to improve Tor software. If you’re a developer, we welcome you to sign up for our dev mailing list to see what we’re up to.") }}</p> + <p class="text-center">{{ _("Even if we aren't hiring, you can contribute to Tor. We are open to ideas and studies to improve Tor software. If you're a developer, we welcome you to sign up for our dev mailing list to see what we're up to.") }}</p> <button class="btn btn-lg btn-outline-primary mr-2" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev"> {{ _("Sign up for tor-dev") }}<i class="oi oi-arrow-right pl-3" title="icon arrow-right" aria-hidden="true"></i> </button> diff --git a/templates/projects.html b/templates/projects.html index 246c9ca..ed08781 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -30,6 +30,6 @@ </div> </div> <div class="row"> - <p>{{ _("Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="">{{ _('We invite you to join us on IRC to find how you can get involved.') }}</a></p> + <p>{{ _("Think you could help us in a position that's not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="">{{ _('We invite you to join us on IRC to find how you can get involved.') }}</a></p> </div> </div>

1 0

[tpo/master] Update to press page
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 02ed5bc97ee53e0773e168e6d1ed9e602badbe45 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 22:07:58 2019 +0100 Update to press page --- .htaccess | 2 +- content/press/contents.lr | 2 +- models/press.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 8041493..0f902e5 100644 --- a/.htaccess +++ b/.htaccess @@ -24,7 +24,7 @@ RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 RewriteRule ^overview(.*) /about/history$1 [R=301,L] # Projects -RewriteRule ^projects/torbrowser/design/(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] +RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] RewriteRule ^projects/$ https://2019.www.torproject.org/projects/projects [R=302,L] #Pluggable Transports diff --git a/content/press/contents.lr b/content/press/contents.lr index 2ec8f6a..ecf28a5 100644 --- a/content/press/contents.lr +++ b/content/press/contents.lr @@ -4,7 +4,7 @@ _model: press --- _discoverable: yes --- -_visible: yes +_hidden: no --- section: The Tor Project --- diff --git a/models/press.ini b/models/press.ini index d84e650..0f6af59 100644 --- a/models/press.ini +++ b/models/press.ini @@ -1,7 +1,7 @@ [model] name = Press label = {{ this.title }} -visible = yes +hidden = no discoverable = yes [fields.title]

1 0

[tpo/master] Merge branch 'master' of git-rw.torproject.org:project/web/tpo
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 3091c213ceb8690f24902fb3c50e8966f836ec98 Merge: 6a46ed8 b5bf68c Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 21:40:07 2019 +0100 Merge branch 'master' of git-rw.torproject.org:project/web/tpo content/about/people/pospeselr/contents.lr | 2 ++ 1 file changed, 2 insertions(+)

1 0