September 2017 - tor-commits - lists.torproject.org

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit b8cfb25d75164384586efb5371770ee84b2c3116 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 01:15:20 2017 +0000 Update translations for torcheck --- es_MX/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es_MX/torcheck.po b/es_MX/torcheck.po index 9495cac3e..69452dbcc 100644 --- a/es_MX/torcheck.po +++ b/es_MX/torcheck.po @@ -4,14 +4,14 @@ # Translators: # Fernando Navarro <fernavarro2(a)yahoo.com>, 2015 # Jacobo Nájera <jacobo(a)gnu.org>, 2015 -# TheFreeman <maurocarrizales(a)outlook.com>, 2014 +# TheFreeman <inactive+TheFreeman(a)transifex.com>, 2014 # Sofía Celi Ramos <soficeli0(a)gmail.com>, 2014 # RytVonD <the_lovely_cock(a)hotmail.co.uk>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2017-09-20 00:56+0000\n" "Last-Translator: Fernando Navarro <fernavarro2(a)yahoo.com>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit ec1120b485dc25ce4f91113fafe10c317e6ae289 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 01:15:15 2017 +0000 Update translations for bridgedb_completed --- es_MX/LC_MESSAGES/bridgedb.po | 4 ++-- lt/LC_MESSAGES/bridgedb.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po index 5c5064d89..c863cd049 100644 --- a/es_MX/LC_MESSAGES/bridgedb.po +++ b/es_MX/LC_MESSAGES/bridgedb.po @@ -7,7 +7,7 @@ # manuelglz <cglzmtzg(a)gmail.com>, 2014 # Javier Flores Topete <javierflorestopete789(a)gmail.com>, 2015 # Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>, 2016 -# TheFreeman <maurocarrizales(a)outlook.com>, 2014 +# TheFreeman <inactive+TheFreeman(a)transifex.com>, 2014 # Melvin Rohark <rohark20(a)gmail.com>, 2016 # tonyskapunk <tonysk8(a)gmx.net>, 2016 msgid "" @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-09-23 16:00+0000\n" +"PO-Revision-Date: 2017-09-20 00:56+0000\n" "Last-Translator: Melvin Rohark <rohark20(a)gmail.com>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index be12e8bf6..62ff21745 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-03-18 23:13+0000\n" +"PO-Revision-Date: 2017-09-20 01:04+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit f68dcf51137c106d719ff73f3d55aed262177627 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 01:15:07 2017 +0000 Update translations for bridgedb --- cv/LC_MESSAGES/bridgedb.po | 4 ++-- cy/LC_MESSAGES/bridgedb.po | 6 +++--- es_CL/LC_MESSAGES/bridgedb.po | 6 +++--- es_MX/LC_MESSAGES/bridgedb.po | 4 ++-- hr/LC_MESSAGES/bridgedb.po | 2 +- kk/LC_MESSAGES/bridgedb.po | 2 +- lt/LC_MESSAGES/bridgedb.po | 2 +- mk/LC_MESSAGES/bridgedb.po | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cv/LC_MESSAGES/bridgedb.po b/cv/LC_MESSAGES/bridgedb.po index 1704f6e9d..00f6529a9 100644 --- a/cv/LC_MESSAGES/bridgedb.po +++ b/cv/LC_MESSAGES/bridgedb.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2017-09-20 01:07+0000\n" +"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" "Language-Team: Chuvash (http://www.transifex.com/otf/torproject/language/cv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/cy/LC_MESSAGES/bridgedb.po b/cy/LC_MESSAGES/bridgedb.po index 25f4a6eb6..403a2c547 100644 --- a/cy/LC_MESSAGES/bridgedb.po +++ b/cy/LC_MESSAGES/bridgedb.po @@ -4,7 +4,7 @@ # # Translators: # Billy Humphreys <sysop(a)enderbbs.enderservices.tk>, 2015 -# Christopher Griffiths <transifex(a)cgriff.co.uk>, 2016 +# ianto <transifex(a)cgriff.co.uk>, 2016 # Huw Waters <huwwaters(a)gmail.com>, 2014 # littlegreykida <theinfinitygap(a)gmail.com>, 2014 msgid "" @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Christopher Griffiths <transifex(a)cgriff.co.uk>\n" +"PO-Revision-Date: 2017-09-20 00:54+0000\n" +"Last-Translator: ianto <transifex(a)cgriff.co.uk>\n" "Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/es_CL/LC_MESSAGES/bridgedb.po b/es_CL/LC_MESSAGES/bridgedb.po index 9afcaa1a9..a83c57c94 100644 --- a/es_CL/LC_MESSAGES/bridgedb.po +++ b/es_CL/LC_MESSAGES/bridgedb.po @@ -4,14 +4,14 @@ # # Translators: # halbares <pablo.alvarez.flores(a)gmail.com>, 2014 -# Pablo Roberto Francisco Lezaeta Reyes <prflr88(a)gmail.com>, 2014 +# Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] <prflr88(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2017-09-20 01:07+0000\n" +"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/otf/torproject/language/es_CL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po index 5c5064d89..c863cd049 100644 --- a/es_MX/LC_MESSAGES/bridgedb.po +++ b/es_MX/LC_MESSAGES/bridgedb.po @@ -7,7 +7,7 @@ # manuelglz <cglzmtzg(a)gmail.com>, 2014 # Javier Flores Topete <javierflorestopete789(a)gmail.com>, 2015 # Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>, 2016 -# TheFreeman <maurocarrizales(a)outlook.com>, 2014 +# TheFreeman <inactive+TheFreeman(a)transifex.com>, 2014 # Melvin Rohark <rohark20(a)gmail.com>, 2016 # tonyskapunk <tonysk8(a)gmx.net>, 2016 msgid "" @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-09-23 16:00+0000\n" +"PO-Revision-Date: 2017-09-20 00:56+0000\n" "Last-Translator: Melvin Rohark <rohark20(a)gmail.com>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" diff --git a/hr/LC_MESSAGES/bridgedb.po b/hr/LC_MESSAGES/bridgedb.po index 0b15cdf03..5703b6321 100644 --- a/hr/LC_MESSAGES/bridgedb.po +++ b/hr/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-09-04 20:32+0000\n" +"PO-Revision-Date: 2017-09-20 00:58+0000\n" "Last-Translator: Joziah Cameron <cambergeron55(a)gmail.com>\n" "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" diff --git a/kk/LC_MESSAGES/bridgedb.po b/kk/LC_MESSAGES/bridgedb.po index 9d2d2c6ad..6bc1d15a0 100644 --- a/kk/LC_MESSAGES/bridgedb.po +++ b/kk/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-16 19:59+0000\n" +"PO-Revision-Date: 2017-09-20 00:56+0000\n" "Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n" "MIME-Version: 1.0\n" diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index be12e8bf6..62ff21745 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-03-18 23:13+0000\n" +"PO-Revision-Date: 2017-09-20 01:04+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po index f8a885164..c37d95be4 100644 --- a/mk/LC_MESSAGES/bridgedb.po +++ b/mk/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-07-08 22:54+0000\n" +"PO-Revision-Date: 2017-09-20 00:54+0000\n" "Last-Translator: Cacko Cackoas <cackothe(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit b194ded20649baacdcbb56c1f291c8211735c9fa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 00:45:18 2017 +0000 Update translations for bridgedb_completed --- pt/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index 8a3c1d0b2..cd9c6b9f9 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-03-09 12:23+0000\n" +"PO-Revision-Date: 2017-09-20 00:39+0000\n" "Last-Translator: Manuela Silva <manuela.silva(a)sky.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit fb2998e5739c7542c5cfbe9db98f59eb7430c811 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 00:45:11 2017 +0000 Update translations for bridgedb --- pt/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index 8a3c1d0b2..cd9c6b9f9 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-03-09 12:23+0000\n" +"PO-Revision-Date: 2017-09-20 00:39+0000\n" "Last-Translator: Manuela Silva <manuela.silva(a)sky.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] sched: reorder code to fit comment bodies; comment typos
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 4a3b61a5b32d4df7d627f993deec97f1db451910 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Sep 19 20:03:17 2017 -0400 sched: reorder code to fit comment bodies; comment typos Closes 23560 --- src/or/scheduler.c | 2 +- src/or/scheduler.h | 4 ++-- src/or/scheduler_kist.c | 45 ++++++++++++++++++++++----------------------- src/or/scheduler_vanilla.c | 2 +- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 6ce7cb1e0..e75e30605 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -25,7 +25,7 @@ * - "Scheduler implementation": a scheduler_t. The scheduling system has one * active scheduling implementation at a time. * - * In this file you will find state that any scheduler implmentation can have + * In this file you will find state that any scheduler implementation can have * access to as well as the functions the rest of Tor uses to interact with the * scheduling system. * diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 3c0748fa6..93da1c904 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -53,7 +53,7 @@ typedef struct scheduler_s { * we should do whatever we need to do in order to move some cells from * their circuit queues to output buffers in an intelligent manner. We * should do this quickly. When we are done, we'll try to schedule() ourself - * if more work needs to be done to setup the next scehduling run. */ + * if more work needs to be done to setup the next scheduling run. */ void (*run)(void); /* @@ -157,7 +157,7 @@ void scheduler_touch_channel(channel_t *chan); #ifdef SCHEDULER_KIST_PRIVATE -/* Socke table entry which holds information of a channel's socket and kernel +/* Socket table entry which holds information of a channel's socket and kernel * TCP information. Only used by KIST. */ typedef struct socket_table_ent_s { HT_ENTRY(socket_table_ent_s) node; diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 4713ffdff..8b0c81c4c 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -28,18 +28,6 @@ * Data structures and supporting functions *****************************************************************************/ -#ifdef HAVE_KIST_SUPPORT -/* Indicate if KIST lite mode is on or off. We can disable it at runtime. - * Important to have because of the KISTLite -> KIST possible transition. */ -static unsigned int kist_lite_mode = 0; -/* Indicate if we don't have the kernel support. This can happen if the kernel - * changed and it doesn't recognized the values passed to the syscalls needed - * by KIST. In that case, fallback to the naive approach. */ -static unsigned int kist_no_kernel_support = 0; -#else /* !(defined(HAVE_KIST_SUPPORT)) */ -static unsigned int kist_lite_mode = 1; -#endif /* defined(HAVE_KIST_SUPPORT) */ - /* Socket_table hash table stuff. The socket_table keeps track of per-socket * limit information imposed by kist and used by kist. */ @@ -105,6 +93,18 @@ static double sock_buf_size_factor = 1.0; /* How often the scheduler runs. */ STATIC int32_t sched_run_interval = 10; +#ifdef HAVE_KIST_SUPPORT +/* Indicate if KIST lite mode is on or off. We can disable it at runtime. + * Important to have because of the KISTLite -> KIST possible transition. */ +static unsigned int kist_lite_mode = 0; +/* Indicate if we don't have the kernel support. This can happen if the kernel + * changed and it doesn't recognized the values passed to the syscalls needed + * by KIST. In that case, fallback to the naive approach. */ +static unsigned int kist_no_kernel_support = 0; +#else /* !(defined(HAVE_KIST_SUPPORT)) */ +static unsigned int kist_lite_mode = 1; +#endif /* defined(HAVE_KIST_SUPPORT) */ + /***************************************************************************** * Internally called function implementations *****************************************************************************/ @@ -256,8 +256,8 @@ update_socket_info_impl, (socket_table_ent_t *ent)) * * <----------------kernel-outbound-socket-queue----------------| * <*********---------------------------------------------------| - * <----TCP-space-----|----extra-space-----| - * <------------------| + * |----TCP-space-----|----extra-space-----| + * |------------------| * ^ ((cwnd - unacked) * mss) bytes * |--------------------| * ^ ((cwnd * mss) * factor) bytes @@ -304,7 +304,7 @@ update_socket_info_impl, (socket_table_ent_t *ent)) } /* Given a socket that isn't in the table, add it. - * Given a socket that is in the table, reinit values that need init-ing + * Given a socket that is in the table, re-init values that need init-ing * every scheduling run */ static void @@ -364,8 +364,7 @@ set_scheduler_run_interval(const networkstatus_t *ns) } } -/* Return true iff the channel associated socket can write to the kernel that - * is hasn't reach the limit. */ +/* Return true iff the channel hasn’t hit its kist-imposed write limit yet */ static int socket_can_write(socket_table_t *table, const channel_t *chan) { @@ -375,7 +374,7 @@ socket_can_write(socket_table_t *table, const channel_t *chan) return 1; // Just return true, saying that kist wouldn't limit the socket } - /* We previously caclulated a write limit for this socket. In the below + /* We previously calculated a write limit for this socket. In the below * calculation, first determine how much room is left in bytes. Then divide * that by the amount of space a cell takes. If there's room for at least 1 * cell, then KIST will allow the socket to write. */ @@ -397,7 +396,7 @@ update_socket_info(socket_table_t *table, const channel_t *chan) update_socket_info_impl(ent); } -/* Increament the channel's socket written value by the number of bytes. */ +/* Increment the channel's socket written value by the number of bytes. */ static void update_socket_written(socket_table_t *table, channel_t *chan, size_t bytes) { @@ -523,11 +522,11 @@ kist_scheduler_schedule(void) if (diff < sched_run_interval) { next_run.tv_sec = 0; /* Takes 1000 ms -> us. This will always be valid because diff can NOT be - * negative and can NOT be smaller than sched_run_interval so values can + * negative and can NOT be bigger than sched_run_interval so values can * only go from 1000 usec (diff set to interval - 1) to 100000 usec (diff * set to 0) for the maximum allowed run interval (100ms). */ next_run.tv_usec = (int) ((sched_run_interval - diff) * 1000); - /* Readding an event reschedules it. It does not duplicate it. */ + /* Re-adding an event reschedules it. It does not duplicate it. */ scheduler_ev_add(&next_run); } else { scheduler_ev_active(EV_TIMEOUT); @@ -543,7 +542,7 @@ kist_scheduler_run(void) /* The last distinct chan served in a sched loop. */ channel_t *prev_chan = NULL; int flush_result; // temporarily store results from flush calls - /* Channels to be readding to pending at the end */ + /* Channels to be re-adding to pending at the end */ smartlist_t *to_readd = NULL; smartlist_t *cp = get_channels_pending(); @@ -667,7 +666,7 @@ kist_scheduler_run(void) smartlist_len(cp), (to_readd ? smartlist_len(to_readd) : -1)); - /* Readd any channels we need to */ + /* Re-add any channels we need to */ if (to_readd) { SMARTLIST_FOREACH_BEGIN(to_readd, channel_t *, readd_chan) { readd_chan->scheduler_state = SCHED_CHAN_PENDING; diff --git a/src/or/scheduler_vanilla.c b/src/or/scheduler_vanilla.c index 09653f445..a49f7a1cb 100644 --- a/src/or/scheduler_vanilla.c +++ b/src/or/scheduler_vanilla.c @@ -32,7 +32,7 @@ have_work(void) return smartlist_len(cp) > 0; } -/** Retrigger the scheduler in a way safe to use from the callback */ +/** Re-trigger the scheduler in a way safe to use from the callback */ static void vanilla_scheduler_schedule(void)

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Sep '17

20 Sep '17

commit 9cdbc5abb1e4ea699997064c67cd84dbc03d6321 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 20 00:15:04 2017 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index e70a85e60..b1ec070aa 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ # snotree <cknblue(a)gmail.com>, 2017 # cwt96 <cwt967(a)naver.com>, 2012 # 고영욱 <greenknite(a)naver.com>, 2015 -# Hyuntae Chun <htchun1204(a)gmail.com>, 2017 +# Hyuntae Chun, 2017 # Jamin <bakzaa(a)gmail.com>, 2014 # Dr.what <javrick6(a)naver.com>, 2014-2015 # Gu Hong Min <placidmoon1(a)gmail.com>, 2015 @@ -23,8 +23,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-08-23 09:05+0000\n" -"Last-Translator: Hyuntae Chun <htchun1204(a)gmail.com>\n" +"PO-Revision-Date: 2017-09-20 00:09+0000\n" +"Last-Translator: Hyuntae Chun\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/master] fix typos/etc found while starting to look at scheduler
by arma＠torproject.org 19 Sep '17

19 Sep '17

commit 1c956ccd5f3221c9d5317d50435253da079831c3 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 19 19:55:57 2017 -0400 fix typos/etc found while starting to look at scheduler --- src/or/hs_service.c | 2 +- src/or/scheduler.c | 51 ++++++++++++++++++++++++--------------------------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index d26f49516..f905a688b 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1917,7 +1917,7 @@ STATIC void run_housekeeping_event(time_t now) { /* Note that nothing here opens circuit(s) nor uploads descriptor(s). We are - * simply moving things around or removing uneeded elements. */ + * simply moving things around or removing unneeded elements. */ FOR_EACH_SERVICE_BEGIN(service) { diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 64628e4c7..6ce7cb1e0 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -35,7 +35,7 @@ * thus could only prioritize circuits against others on the same connection. * * Then in response to the KIST paper[0], Tor implemented a global - * circuit scheduler. It was supposed to prioritize circuits across man + * circuit scheduler. It was supposed to prioritize circuits across many * channels, but wasn't effective. It is preserved in scheduler_vanilla.c. * * [0]: http://www.robgjansen.com/publications/kist-sec2014.pdf @@ -95,7 +95,7 @@ * <ul> * <li>Not open for writes/no cells by arrival of cells on an attached * circuit - * <li> Open for writes/has cells by filling an output buffer without + * <li>Open for writes/has cells by filling an output buffer without * draining all cells from attached circuits * </ul> * <li> Transitions to: @@ -112,9 +112,9 @@ * SCHED_CHAN_PENDING. * <li>Transitions from: * <ul> - * <li> Not open for writes/has cells by the connection_or_flushed_some() + * <li>Not open for writes/has cells by the connection_or_flushed_some() * path - * <li> Open for writes/no cells by the append_cell_to_circuit_queue() + * <li>Open for writes/no cells by the append_cell_to_circuit_queue() * path * </ul> * <li> Transitions to: @@ -149,9 +149,10 @@ * outside the scheduling system) *****************************************************************************/ +/** DOCDOC */ STATIC const scheduler_t *the_scheduler; -/* +/** * We keep a list of channels that are pending - i.e, have cells to write * and can accept them to send. The enum scheduler_state in channel_t * is reserved for our use. @@ -160,7 +161,7 @@ STATIC const scheduler_t *the_scheduler; */ STATIC smartlist_t *channels_pending = NULL; -/* +/** * This event runs the scheduler from its callback, and is manually * activated whenever a channel enters open for writes/cells to send. */ @@ -172,7 +173,7 @@ STATIC struct event *run_sched_ev = NULL; * Functions that can only be accessed from this file. *****************************************************************************/ -/* +/** * Scheduler event callback; this should get triggered once per event loop * if any scheduling work was created during the event loop. */ @@ -208,14 +209,14 @@ scheduler_evt_callback(evutil_socket_t fd, short events, void *arg) * Functions that can only be accessed from scheduler*.c *****************************************************************************/ -/* Return the pending channel list. */ +/** Return the pending channel list. */ smartlist_t * get_channels_pending(void) { return channels_pending; } -/* Comparison function to use when sorting pending channels */ +/** Comparison function to use when sorting pending channels. */ MOCK_IMPL(int, scheduler_compare_channels, (const void *c1_v, const void *c2_v)) { @@ -261,7 +262,7 @@ scheduler_compare_channels, (const void *c1_v, const void *c2_v)) * Functions that can be accessed from anywhere in Tor. *****************************************************************************/ -/* Using the global options, select the scheduler we should be using. */ +/** Using the global options, select the scheduler we should be using. */ static void select_scheduler(void) { @@ -269,7 +270,7 @@ select_scheduler(void) #ifdef TOR_UNIT_TESTS /* This is hella annoying to set in the options for every test that passes - * through the scheduler and there are many so if we don't explicitely have + * through the scheduler and there are many so if we don't explicitly have * a list of types set, just put the vanilla one. */ if (get_options()->SchedulerTypes_ == NULL) { the_scheduler = get_vanilla_scheduler(); @@ -320,8 +321,8 @@ select_scheduler(void) chosen_sched_type); } -/* - * Little helper function called from a few different places. It changes the +/** + * Helper function called from a few different places. It changes the * scheduler implementation, if necessary. And if it did, it then tells the * old one to free its state and the new one to initialize. */ @@ -338,8 +339,6 @@ set_scheduler(void) if (old_scheduler && old_scheduler->free_all) { old_scheduler->free_all(); } - /* We don't clean up the old scheduler_t. We keep any type of scheduler - * we've allocated so we can do an easy switch back. */ /* Initialize the new scheduler. */ if (the_scheduler->init) { @@ -348,7 +347,7 @@ set_scheduler(void) } } -/* +/** * This is how the scheduling system is notified of Tor's configuration * changing. For example: a SIGHUP was issued. */ @@ -364,7 +363,7 @@ scheduler_conf_changed(void) } } -/* +/** * Whenever we get a new consensus, this function is called. */ void @@ -380,7 +379,7 @@ scheduler_notify_networkstatus_changed(const networkstatus_t *old_c, } } -/* +/** * Free everything scheduling-related from main.c. Note this is only called * when Tor is shutting down, while scheduler_t->free_all() is called both when * Tor is shutting down and when we are switching schedulers. @@ -399,7 +398,7 @@ scheduler_free_all(void) } if (channels_pending) { - /* We don't have ownership of the object in this list. */ + /* We don't have ownership of the objects in this list. */ smartlist_free(channels_pending); channels_pending = NULL; } @@ -410,8 +409,7 @@ scheduler_free_all(void) the_scheduler = NULL; } -/** Mark a channel as no longer ready to accept writes */ - +/** Mark a channel as no longer ready to accept writes. */ MOCK_IMPL(void, scheduler_channel_doesnt_want_writes,(channel_t *chan)) { @@ -453,8 +451,7 @@ scheduler_channel_doesnt_want_writes,(channel_t *chan)) } } -/** Mark a channel as having waiting cells */ - +/** Mark a channel as having waiting cells. */ MOCK_IMPL(void, scheduler_channel_has_waiting_cells,(channel_t *chan)) { @@ -465,7 +462,7 @@ scheduler_channel_has_waiting_cells,(channel_t *chan)) return; } - /* First, check if this one also writeable */ + /* First, check if it's also writeable */ if (chan->scheduler_state == SCHED_CHAN_WAITING_FOR_CELLS) { /* * It's in channels_waiting_for_cells, so it shouldn't be in any of @@ -500,8 +497,8 @@ scheduler_channel_has_waiting_cells,(channel_t *chan)) } } -/* Add the scheduler event to the set of pending events with next_run being - * the time up to libevent should wait before triggering the event. */ +/** Add the scheduler event to the set of pending events with next_run being + * the longest time libevent should wait before triggering the event. */ void scheduler_ev_add(const struct timeval *next_run) { @@ -514,7 +511,7 @@ scheduler_ev_add(const struct timeval *next_run) } } -/* Make the scheduler event active with the given flags. */ +/** Make the scheduler event active with the given flags. */ void scheduler_ev_active(int flags) {

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 19 Sep '17

19 Sep '17

commit 3d82b8fe261bb445847808f0534b338d5c5f1f94 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 19 23:45:26 2017 +0000 Update translations for whisperback --- en_GB/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 7f197187e..7abd61d84 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-21 08:24+0000\n" +"PO-Revision-Date: 2017-09-19 23:30+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 19 Sep '17

19 Sep '17

commit 6a7f95f218f9fac63282b5d000f526c0dfc4d4dc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 19 23:45:11 2017 +0000 Update translations for bridgedb_completed --- en_GB/LC_MESSAGES/bridgedb.po | 2 +- sl_SI/LC_MESSAGES/bridgedb.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po index b3a290de5..4779a14a3 100644 --- a/en_GB/LC_MESSAGES/bridgedb.po +++ b/en_GB/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2017-09-19 23:30+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/sl_SI/LC_MESSAGES/bridgedb.po b/sl_SI/LC_MESSAGES/bridgedb.po index 1a7f051f8..4360d4387 100644 --- a/sl_SI/LC_MESSAGES/bridgedb.po +++ b/sl_SI/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2017-09-19 23:33+0000\n" "Last-Translator: Tomi Bizjak <bizjaktomaz72(a)gmail.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/otf/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n"

1 0