November 2014 - tor-commits - lists.torproject.org

[tor/master] Remove smartlist_choose_node_by_bandwidth()
by nickm＠torproject.org 26 Nov '14

26 Nov '14

commit 415a841378db2489c525ea0c55b169bd2894e992 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 3 13:30:19 2014 -0500 Remove smartlist_choose_node_by_bandwidth() We were only using it when smartlist_choose_node_by_bandwidth_weights failed. But that function could only fail in the presence of buggy/ancient authorities or in the absence of a consensus. Either way, it's better to use sensible defaults and a nicer algorithm. --- changes/bug13126 | 10 +++ src/or/or.h | 2 +- src/or/routerlist.c | 236 +++------------------------------------------------ 3 files changed, 25 insertions(+), 223 deletions(-) diff --git a/changes/bug13126 b/changes/bug13126 new file mode 100644 index 0000000..45d22ee --- /dev/null +++ b/changes/bug13126 @@ -0,0 +1,10 @@ + o Code simplification and refactoring: + + - Remove our old, non-weighted bandwidth-based node selection code. + Previously, we used it as a fallback when we couldn't perform + weighted bandwidth-based node selection. But that would only + happen in the cases where we had no consensus, or when we had a + consensus generated by buggy or ancient directory authorities. In + either case, it's better to use the more modern, better maintained + algorithm, with reasonable defaults for the weights. Closes + ticket 13126. \ No newline at end of file diff --git a/src/or/or.h b/src/or/or.h index 6170c21..a681def 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -5006,7 +5006,7 @@ typedef enum was_router_added_t { ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS = -4, ROUTER_AUTHDIR_REJECTS = -5, ROUTER_WAS_NOT_WANTED = -6, - ROUTER_WAS_TOO_OLD = -7, + ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'NOT_NEW' */ } was_router_added_t; /********************************* routerparse.c ************************/ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d81dae4..46010ea 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2030,9 +2030,10 @@ compute_weighted_bandwidths(const smartlist_t *sl, if (Wg < 0 || Wm < 0 || We < 0 || Wd < 0 || Wgb < 0 || Wmb < 0 || Wdb < 0 || Web < 0) { log_debug(LD_CIRC, - "Got negative bandwidth weights. Defaulting to old selection" + "Got negative bandwidth weights. Defaulting to naive selection" " algorithm."); - return -1; // Use old algorithm. + Wg = Wm = We = Wd = weight_scale; + Wgb = Wmb = Web = Wdb = weight_scale; } Wg /= weight_scale; @@ -2048,6 +2049,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, bandwidths = tor_calloc(smartlist_len(sl), sizeof(u64_dbl_t)); // Cycle through smartlist and total the bandwidth. + static int warned_missing_bw = 0; SMARTLIST_FOREACH_BEGIN(sl, const node_t *, node) { int is_exit = 0, is_guard = 0, is_dir = 0, this_bw = 0; double weight = 1; @@ -2056,15 +2058,18 @@ compute_weighted_bandwidths(const smartlist_t *sl, is_dir = node_is_dir(node); if (node->rs) { if (!node->rs->has_bandwidth) { - tor_free(bandwidths); /* This should never happen, unless all the authorites downgrade * to 0.2.0 or rogue routerstatuses get inserted into our consensus. */ - log_warn(LD_BUG, - "Consensus is not listing bandwidths. Defaulting back to " - "old router selection algorithm."); - return -1; + if (! warned_missing_bw) { + log_warn(LD_BUG, + "Consensus is missing some bandwidths. Using a naive " + "router selection algorithm"); + warned_missing_bw = 1; + } + this_bw = 30000; /* Chosen arbitrarily */ + } else { + this_bw = kb_to_bytes(node->rs->bandwidth_kb); } - this_bw = kb_to_bytes(node->rs->bandwidth_kb); } else if (node->ri) { /* bridge or other descriptor not in our consensus */ this_bw = bridge_get_advertised_bandwidth_bounded(node->ri); @@ -2141,226 +2146,13 @@ frac_nodes_with_descriptors(const smartlist_t *sl, return present / total; } -/** Helper function: - * choose a random node_t element of smartlist sl, weighted by - * the advertised bandwidth of each element. - * - * If rule==WEIGHT_FOR_EXIT. we're picking an exit node: consider all - * nodes' bandwidth equally regardless of their Exit status, since there may - * be some in the list because they exit to obscure ports. If - * rule==NO_WEIGHTING, we're picking a non-exit node: weight - * exit-node's bandwidth less depending on the smallness of the fraction of - * Exit-to-total bandwidth. If rule==WEIGHT_FOR_GUARD, we're picking a - * guard node: consider all guard's bandwidth equally. Otherwise, weight - * guards proportionally less. - */ -static const node_t * -smartlist_choose_node_by_bandwidth(const smartlist_t *sl, - bandwidth_weight_rule_t rule) -{ - unsigned int i; - u64_dbl_t *bandwidths; - int is_exit; - int is_guard; - int is_fast; - double total_nonexit_bw = 0, total_exit_bw = 0; - double total_nonguard_bw = 0, total_guard_bw = 0; - double exit_weight; - double guard_weight; - int n_unknown = 0; - bitarray_t *fast_bits; - bitarray_t *exit_bits; - bitarray_t *guard_bits; - - // This function does not support WEIGHT_FOR_DIR - // or WEIGHT_FOR_MID - if (rule == WEIGHT_FOR_DIR || rule == WEIGHT_FOR_MID) { - rule = NO_WEIGHTING; - } - - /* Can't choose exit and guard at same time */ - tor_assert(rule == NO_WEIGHTING || - rule == WEIGHT_FOR_EXIT || - rule == WEIGHT_FOR_GUARD); - - if (smartlist_len(sl) == 0) { - log_info(LD_CIRC, - "Empty routerlist passed in to old node selection for rule %s", - bandwidth_weight_rule_to_string(rule)); - return NULL; - } - - /* First count the total bandwidth weight, and make a list - * of each value. We use UINT64_MAX to indicate "unknown". */ - bandwidths = tor_calloc(smartlist_len(sl), sizeof(u64_dbl_t)); - fast_bits = bitarray_init_zero(smartlist_len(sl)); - exit_bits = bitarray_init_zero(smartlist_len(sl)); - guard_bits = bitarray_init_zero(smartlist_len(sl)); - - /* Iterate over all the routerinfo_t or routerstatus_t, and */ - SMARTLIST_FOREACH_BEGIN(sl, const node_t *, node) { - /* first, learn what bandwidth we think i has */ - int is_known = 1; - uint32_t this_bw = 0; - i = node_sl_idx; - - is_exit = node_is_good_exit(node); - is_guard = node->is_possible_guard; - if (node->rs) { - if (node->rs->has_bandwidth) { - this_bw = kb_to_bytes(node->rs->bandwidth_kb); - } else { /* guess */ - is_known = 0; - } - } else if (node->ri) { - /* Must be a bridge if we're willing to use it */ - this_bw = bridge_get_advertised_bandwidth_bounded(node->ri); - } - - if (is_exit) - bitarray_set(exit_bits, i); - if (is_guard) - bitarray_set(guard_bits, i); - if (node->is_fast) - bitarray_set(fast_bits, i); - - if (is_known) { - bandwidths[i].dbl = this_bw; - if (is_guard) - total_guard_bw += this_bw; - else - total_nonguard_bw += this_bw; - if (is_exit) - total_exit_bw += this_bw; - else - total_nonexit_bw += this_bw; - } else { - ++n_unknown; - bandwidths[i].dbl = -1.0; - } - } SMARTLIST_FOREACH_END(node); - -#define EPSILON .1 - - /* Now, fill in the unknown values. */ - if (n_unknown) { - int32_t avg_fast, avg_slow; - if (total_exit_bw+total_nonexit_bw < EPSILON) { - /* if there's some bandwidth, there's at least one known router, - * so no worries about div by 0 here */ - int n_known = smartlist_len(sl)-n_unknown; - avg_fast = avg_slow = (int32_t) - ((total_exit_bw+total_nonexit_bw)/((uint64_t) n_known)); - } else { - avg_fast = 40000; - avg_slow = 20000; - } - for (i=0; i<(unsigned)smartlist_len(sl); ++i) { - if (bandwidths[i].dbl >= 0.0) - continue; - is_fast = bitarray_is_set(fast_bits, i); - is_exit = bitarray_is_set(exit_bits, i); - is_guard = bitarray_is_set(guard_bits, i); - bandwidths[i].dbl = is_fast ? avg_fast : avg_slow; - if (is_exit) - total_exit_bw += bandwidths[i].dbl; - else - total_nonexit_bw += bandwidths[i].dbl; - if (is_guard) - total_guard_bw += bandwidths[i].dbl; - else - total_nonguard_bw += bandwidths[i].dbl; - } - } - - /* If there's no bandwidth at all, pick at random. */ - if (total_exit_bw+total_nonexit_bw < EPSILON) { - tor_free(bandwidths); - tor_free(fast_bits); - tor_free(exit_bits); - tor_free(guard_bits); - return smartlist_choose(sl); - } - - /* Figure out how to weight exits and guards */ - { - double all_bw = U64_TO_DBL(total_exit_bw+total_nonexit_bw); - double exit_bw = U64_TO_DBL(total_exit_bw); - double guard_bw = U64_TO_DBL(total_guard_bw); - /* - * For detailed derivation of this formula, see - * http://archives.seul.org/or/dev/Jul-2007/msg00056.html - */ - if (rule == WEIGHT_FOR_EXIT || total_exit_bw<EPSILON) - exit_weight = 1.0; - else - exit_weight = 1.0 - all_bw/(3.0*exit_bw); - - if (rule == WEIGHT_FOR_GUARD || total_guard_bw<EPSILON) - guard_weight = 1.0; - else - guard_weight = 1.0 - all_bw/(3.0*guard_bw); - - if (exit_weight <= 0.0) - exit_weight = 0.0; - - if (guard_weight <= 0.0) - guard_weight = 0.0; - - for (i=0; i < (unsigned)smartlist_len(sl); i++) { - tor_assert(bandwidths[i].dbl >= 0.0); - - is_exit = bitarray_is_set(exit_bits, i); - is_guard = bitarray_is_set(guard_bits, i); - if (is_exit && is_guard) - bandwidths[i].dbl *= exit_weight * guard_weight; - else if (is_guard) - bandwidths[i].dbl *= guard_weight; - else if (is_exit) - bandwidths[i].dbl *= exit_weight; - } - } - -#if 0 - log_debug(LD_CIRC, "Total weighted bw = "U64_FORMAT - ", exit bw = "U64_FORMAT - ", nonexit bw = "U64_FORMAT", exit weight = %f " - "(for exit == %d)" - ", guard bw = "U64_FORMAT - ", nonguard bw = "U64_FORMAT", guard weight = %f " - "(for guard == %d)", - U64_PRINTF_ARG(total_bw), - U64_PRINTF_ARG(total_exit_bw), U64_PRINTF_ARG(total_nonexit_bw), - exit_weight, (int)(rule == WEIGHT_FOR_EXIT), - U64_PRINTF_ARG(total_guard_bw), U64_PRINTF_ARG(total_nonguard_bw), - guard_weight, (int)(rule == WEIGHT_FOR_GUARD)); -#endif - - scale_array_elements_to_u64(bandwidths, smartlist_len(sl), NULL); - - { - int idx = choose_array_element_by_weight(bandwidths, - smartlist_len(sl)); - tor_free(bandwidths); - tor_free(fast_bits); - tor_free(exit_bits); - tor_free(guard_bits); - return idx < 0 ? NULL : smartlist_get(sl, idx); - } -} - /** Choose a random element of status list sl, weighted by * the advertised bandwidth of each node */ const node_t * node_sl_choose_by_bandwidth(const smartlist_t *sl, bandwidth_weight_rule_t rule) { /*XXXX MOVE */ - const node_t *ret; - if ((ret = smartlist_choose_node_by_bandwidth_weights(sl, rule))) { - return ret; - } else { - return smartlist_choose_node_by_bandwidth(sl, rule); - } + return smartlist_choose_node_by_bandwidth_weights(sl, rule); } /** Return a random running node from the nodelist. Never

1 0

[tor-messenger-build/master] instantbird: fix "mach package" with mingw
by boklm＠torproject.org 26 Nov '14

26 Nov '14

commit 50ccd3ce864c510694c2940e2b89b6185abd0492 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 26 14:46:57 2014 +0100 instantbird: fix "mach package" with mingw --- projects/instantbird/fix-mingw-build.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch index 7eefc39..683a3fb 100644 --- a/projects/instantbird/fix-mingw-build.patch +++ b/projects/instantbird/fix-mingw-build.patch @@ -11,6 +11,24 @@ index 048ef94facc1..71d1a3409c79 100644 # For Windows build the uninstaller during the application build since the # uninstaller is included with the application for mar file generation. libs:: +diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in +index 2a7af7daf20f..6e3855d87f4d 100644 +--- a/im/installer/Makefile.in ++++ b/im/installer/Makefile.in +@@ -50,9 +50,13 @@ DEFINES += -DJAREXT= + + ifdef MOZ_ANGLE_RENDERER + DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) ++ifdef MOZ_D3DCOMPILER_VISTA_DLL + DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL) ++endif ++ifdef MOZ_D3DCOMPILER_XP_DLL + DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL) + endif ++endif + + ifdef MOZ_UPDATER + DEFINES += -DMOZ_UPDATER=1 diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in index 12397ff741fc..27d581f53c97 100644 --- a/im/installer/package-manifest.in

1 0

[tor-messenger-build/master] Update SocksPort and ControlPort in torrc-defaults
by boklm＠torproject.org 26 Nov '14

26 Nov '14

commit 0f497e5517b2c533527a666e4968d156e5f1de34 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 26 12:32:07 2014 +0100 Update SocksPort and ControlPort in torrc-defaults --- projects/tor-messenger/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 6e01dcf..4c86230 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -13,6 +13,8 @@ mkdir tor-launcher(a)torproject.org unzip -q ../../[% c('input_files_by_name/tor-launcher') %] -d tor-launcher(a)torproject.org mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data tar xf ../../[% c('input_files_by_name/tor-browser') %] +sed -i 's/^SocksPort .*/SocksPort 9152/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +sed -i 's/^ControlPort .*/ControlPort 9153/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor mv tor-browser_en-US/Browser/TorBrowser/Data/Tor tor-launcher(a)torproject.org/TorBrowser/Data/Tor rm -Rf tor-browser_en-US

1 0

[stem/master] Adding the HEARTBEAT signal type
by atagar＠torproject.org 25 Nov '14

25 Nov '14

commit 73f04de83faa5f6f560cd1305efd0faa409a2314 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 25 10:34:27 2014 -0800 Adding the HEARTBEAT signal type New type of signal accepted by tor... https://gitweb.torproject.org/torspec.git/commitdiff/1d1c11f12ab9cf32f44e29… --- docs/change_log.rst | 4 ++-- stem/__init__.py | 2 ++ stem/control.py | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 30c01a1..4034884 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -50,6 +50,8 @@ The following are only available within Stem's `git repository * Added :class:`~stem.exit_policy.ExitPolicy` methods for more easily handling 'private' policies (the `default prefix <https://www.torproject.org/docs/tor-manual.html.en#ExitPolicyRejectPrivate>`_) and the defaultly appended suffix. This includes :func:`~stem.exit_policy.ExitPolicy.has_private`, :func:`~stem.exit_policy.ExitPolicy.strip_private`, :func:`~stem.exit_policy.ExitPolicy.has_default`, and :func:`~stem.exit_policy.ExitPolicy.strip_default` :class:`~stem.exit_policy.ExitPolicy` methods in addition to :func:`~stem.exit_policy.ExitPolicyRule.is_private` and :func:`~stem.exit_policy.ExitPolicyRule.is_default` for the :class:`~stem.exit_policy.ExitPolicyRule`. (:trac:`10107`) * Added the reason attribute to the :class:`~stem.response.events.HSDescEvent` (:spec:`7908c8d`) * :func:`~stem.process.launch_tor_with_config` could cause a "Too many open files" OSError if called too many times (:trac:`13141`) + * The :func:`~stem.control.Controller.get_exit_policy` method errored if tor couldn't determine our external address + * The Controller's methods for retrieving descriptors could raise unexpected ValueErrors if tor didn't have any descriptors available * **Descriptors** @@ -101,8 +103,6 @@ among numerous other improvements and fixes. * The :func:`~stem.control.Controller.add_event_listener` method couldn't accept event types that Stem didn't already recognize * The :class:`~stem.exit_policy.ExitPolicy` class couldn't be pickled * Tor instances spawned with :func:`~stem.process.launch_tor` and :func:`~stem.process.launch_tor_with_config` could hang due to unread stdout content, we now close stdout and stderr once tor finishes bootstrapping (:trac:`9862`) - * The :func:`~stem.control.Controller.get_exit_policy` method errored if tor couldn't determine our external address - * The Controller's methods for retrieving descriptors could raise unexpected ValueErrors if tor didn't have any descriptors available * **Descriptors** diff --git a/stem/__init__.py b/stem/__init__.py index eb84be7..310f4ab 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -46,6 +46,7 @@ Library for working with the tor process. **HALT** or **TERM** exit tor immediately **NEWNYM** switch to new circuits, so new application requests don't share any circuits with old ones (this also clears our DNS cache) **CLEARDNSCACHE** clears cached DNS results + **HEARTBEAT** trigger a heartbeat log message ========================= =========== .. data:: Flag (enum) @@ -604,6 +605,7 @@ Signal = stem.util.enum.UppercaseEnum( 'TERM', 'NEWNYM', 'CLEARDNSCACHE', + 'HEARTBEAT', ) CircStatus = stem.util.enum.UppercaseEnum( diff --git a/stem/control.py b/stem/control.py index 431e360..f947aca 100644 --- a/stem/control.py +++ b/stem/control.py @@ -2892,6 +2892,8 @@ class Controller(BaseController): * Effective Rate = min(BandwidthRate, RelayBandwidthRate, MaxAdvertisedBandwidth) * Effective Burst = min(BandwidthBurst, RelayBandwidthBurst) + .. versionadded:: 1.3.0 + :param object default: response if the query fails :param bool burst: provides the burst bandwidth, otherwise this provides the standard rate

1 0

[tor/master] Merge branch 'feature9503_squashed'
by nickm＠torproject.org 25 Nov '14

25 Nov '14

commit 3a91a08e212ac125215b9aff5ad1ae4102623ab9 Merge: b4ead16 bf67a60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 25 12:49:09 2014 -0500 Merge branch 'feature9503_squashed' changes/feature9503 | 4 ++++ src/or/control.c | 4 ++++ src/or/main.c | 4 ++++ src/or/or.h | 1 + 4 files changed, 13 insertions(+)

1 0

[tor/master] Sending response to SIGNAL HEARTBEAT controller command.
by nickm＠torproject.org 25 Nov '14

25 Nov '14

commit bf67a60b86b92f94d0c8b3c13edf4e8ff965c324 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 4 19:29:29 2014 +0200 Sending response to SIGNAL HEARTBEAT controller command. --- src/or/control.c | 3 +++ src/or/main.c | 1 + 2 files changed, 4 insertions(+) diff --git a/src/or/control.c b/src/or/control.c index 5c65189..37f3344 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4455,6 +4455,9 @@ control_event_signal(uintptr_t signal) case SIGCLEARDNSCACHE: signal_string = "CLEARDNSCACHE"; break; + case SIGHEARTBEAT: + signal_string = "HEARTBEAT"; + break; default: log_warn(LD_BUG, "Unrecognized signal %lu in control_event_signal", (unsigned long)signal); diff --git a/src/or/main.c b/src/or/main.c index 6a6e36a..d33eeb9 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2139,6 +2139,7 @@ process_signal(uintptr_t sig) break; case SIGHEARTBEAT: log_heartbeat(time(NULL)); + control_event_signal(sig); break; } }

1 0

[tor/master] Adding 'SIGNAL HEARTBEAT' message that causes unscheduled heartbeat.
by nickm＠torproject.org 25 Nov '14

25 Nov '14

commit 8c135062e51b2ead38a756b045e7d243ffbda5a9 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 2 19:14:58 2014 +0200 Adding 'SIGNAL HEARTBEAT' message that causes unscheduled heartbeat. --- changes/feature9503 | 4 ++++ src/or/control.c | 1 + src/or/main.c | 3 +++ src/or/or.h | 1 + 4 files changed, 9 insertions(+) diff --git a/changes/feature9503 b/changes/feature9503 new file mode 100644 index 0000000..58ae67f --- /dev/null +++ b/changes/feature9503 @@ -0,0 +1,4 @@ + o Minor features (controller): + - Add a "SIGNAL HEARTBEAT" Tor controller command that provokes + writing unscheduled heartbeat message to the log. Implements + feature 9503. diff --git a/src/or/control.c b/src/or/control.c index e3f9131..5c65189 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1263,6 +1263,7 @@ static const struct signal_t signal_table[] = { { SIGTERM, "INT" }, { SIGNEWNYM, "NEWNYM" }, { SIGCLEARDNSCACHE, "CLEARDNSCACHE"}, + { SIGHEARTBEAT, "HEARTBEAT"}, { 0, NULL }, }; diff --git a/src/or/main.c b/src/or/main.c index 5a4e0a3..6a6e36a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2137,6 +2137,9 @@ process_signal(uintptr_t sig) addressmap_clear_transient(); control_event_signal(sig); break; + case SIGHEARTBEAT: + log_heartbeat(time(NULL)); + break; } } diff --git a/src/or/or.h b/src/or/or.h index 6170c21..a0d3043 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -119,6 +119,7 @@ * conflict with system-defined signals. */ #define SIGNEWNYM 129 #define SIGCLEARDNSCACHE 130 +#define SIGHEARTBEAT 131 #if (SIZEOF_CELL_T != 0) /* On Irix, stdlib.h defines a cell_t type, so we need to make sure

1 0

[torspec/master] Merge remote-tracking branch 'rl1987/feature9503'
by nickm＠torproject.org 25 Nov '14

25 Nov '14

commit a35a97123e9a3e6b8c455c34b8e86e3201aeba96 Merge: 7908c8d 1d1c11f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 25 12:47:49 2014 -0500 Merge remote-tracking branch 'rl1987/feature9503' control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[torspec/master] Documenting HEARTBEAT controller signal.
by nickm＠torproject.org 25 Nov '14

25 Nov '14

commit 1d1c11f12ab9cf32f44e29a9f322dd8fd04ecf9b Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 2 19:37:06 2014 +0200 Documenting HEARTBEAT controller signal. --- control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 70ddf3b..b349f6d 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -364,7 +364,7 @@ Signal = "RELOAD" / "SHUTDOWN" / "DUMP" / "DEBUG" / "HALT" / "HUP" / "INT" / "USR1" / "USR2" / "TERM" / "NEWNYM" / - "CLEARDNSCACHE" + "CLEARDNSCACHE" / "HEARTBEAT" The meaning of the signals are: @@ -381,6 +381,7 @@ don't share any circuits with old ones. Also clears the client-side DNS cache. (Tor MAY rate-limit its response to this signal.) + HEARTBEAT -- Make Tor dump an unscheduled Heartbeat message to log. The server responds with "250 OK" if the signal is recognized (or simply closes the socket if it was asked to close immediately), or "552

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 25 Nov '14

25 Nov '14

commit 8213719a361e35edde359e0c5be0bbad79b5ed55 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 25 16:15:14 2014 +0000 Update translations for torcheck_completed --- nb/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nb/torcheck.po b/nb/torcheck.po index c1205f1..d162465 100644 --- a/nb/torcheck.po +++ b/nb/torcheck.po @@ -5,12 +5,13 @@ # FreedomIsGreat <kmdl(a)hotmail.no>, 2012 # Knut Ole <>, 2012 # lateralus, 2013-2014 +# Patrick S <spill.p(a)hotmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: lateralus\n" +"PO-Revision-Date: 2014-11-25 16:02+0000\n" +"Last-Translator: Patrick S <spill.p(a)hotmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "En sikkerhetsoppdatering er tilgjengelig for Tor Browser Bundle." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Trykk her for å gå til nedlastningssiden.</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klikk her for å gå til nedlastningssiden.</a>" msgid "Sorry. You are not using Tor." msgstr "Beklager. Du bruker ikke Tor."

1 0