May 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'yawning/bug16052a_027'
by nickm＠torproject.org 21 May '15

21 May '15

commit eb7f4d0059d447f79362be22c9c0c3c66ec85857 Merge: b668d30 712bf06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 21 10:48:52 2015 -0400 Merge remote-tracking branch 'yawning/bug16052a_027' changes/feature16052 | 5 +++ doc/tor.1.txt | 10 ++++++ src/or/circuituse.c | 27 +++++++++++----- src/or/config.c | 2 ++ src/or/connection_edge.c | 2 ++ src/or/control.c | 21 +++++++++++- src/or/or.h | 3 ++ src/or/rendservice.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- src/or/rendservice.h | 2 ++ 9 files changed, 141 insertions(+), 10 deletions(-)

1 0

[tor/master] Add support for 'HiddenServiceMaxStream' to 'ADD_ONION'.
by nickm＠torproject.org 21 May '15

21 May '15

commit 712bf069781d7a6336501aab628f62ada4f4c4d7 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed May 20 17:41:27 2015 +0000 Add support for 'HiddenServiceMaxStream' to 'ADD_ONION'. Done as a separate commit to ease backporting the tunables to 0.2.6.x. --- src/or/control.c | 21 ++++++++++++++++++++- src/or/rendservice.c | 26 +++++++++++++++++++++++++- src/or/rendservice.h | 2 ++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 4eeb897..746dfff 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3566,9 +3566,12 @@ handle_control_add_onion(control_connection_t *conn, smartlist_t *port_cfgs = smartlist_new(); int discard_pk = 0; int detach = 0; + int max_streams = 0; + int max_streams_close_circuit = 0; for (size_t i = 1; i < arg_len; i++) { static const char *port_prefix = "Port="; static const char *flags_prefix = "Flags="; + static const char *max_s_prefix = "MaxStreams="; const char *arg = smartlist_get(args, i); if (!strcasecmpstart(arg, port_prefix)) { @@ -3582,15 +3585,27 @@ handle_control_add_onion(control_connection_t *conn, goto out; } smartlist_add(port_cfgs, cfg); + } else if (!strcasecmpstart(arg, max_s_prefix)) { + /* "MaxStreams=[0..65535]". */ + const char *max_s_str = arg + strlen(max_s_prefix); + int ok = 0; + max_streams = (int)tor_parse_long(max_s_str, 10, 0, 65535, &ok, NULL); + if (!ok) { + connection_printf_to_buf(conn, "512 Invalid MaxStreams\r\n"); + goto out; + } } else if (!strcasecmpstart(arg, flags_prefix)) { /* "Flags=Flag[,Flag]", where Flag can be: * * 'DiscardPK' - If tor generates the keypair, do not include it in * the response. * * 'Detach' - Do not tie this onion service to any particular control * connection. + * * 'MaxStreamsCloseCircuit' - Close the circuit if MaxStreams is + * exceeded. */ static const char *discard_flag = "DiscardPK"; static const char *detach_flag = "Detach"; + static const char *max_s_close_flag = "MaxStreamsCloseCircuit"; smartlist_t *flags = smartlist_new(); int bad = 0; @@ -3607,6 +3622,8 @@ handle_control_add_onion(control_connection_t *conn, discard_pk = 1; } else if (!strcasecmp(flag, detach_flag)) { detach = 1; + } else if (!strcasecmp(flag, max_s_close_flag)) { + max_streams_close_circuit = 1; } else { connection_printf_to_buf(conn, "512 Invalid 'Flags' argument: %s\r\n", @@ -3652,7 +3669,9 @@ handle_control_add_onion(control_connection_t *conn, * regardless of success/failure. */ char *service_id = NULL; - int ret = rend_service_add_ephemeral(pk, port_cfgs, &service_id); + int ret = rend_service_add_ephemeral(pk, port_cfgs, max_streams, + max_streams_close_circuit, + &service_id); port_cfgs = NULL; /* port_cfgs is now owned by the rendservice code. */ switch (ret) { case RSAE_OKAY: diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 5d2225e..0329d70 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -266,6 +266,23 @@ rend_add_service(rend_service_t *service) service->intro_nodes = smartlist_new(); + if (service->max_streams_per_circuit < 0) { + log_warn(LD_CONFIG, "Hidden service (%s) configured with negative max " + "streams per circuit; ignoring.", + rend_service_escaped_dir(service)); + rend_service_free(service); + return -1; + } + + if (service->max_streams_close_circuit < 0 || + service->max_streams_close_circuit > 1) { + log_warn(LD_CONFIG, "Hidden service (%s) configured with invalid " + "max streams handling; ignoring.", + rend_service_escaped_dir(service)); + rend_service_free(service); + return -1; + } + if (service->auth_type != REND_NO_AUTH && smartlist_len(service->clients) == 0) { log_warn(LD_CONFIG, "Hidden service (%s) with client authorization but no " @@ -792,7 +809,10 @@ rend_config_services(const or_options_t *options, int validate_only) return 0; } -/** Add the ephemeral service pk/ports if possible. +/** Add the ephemeral service pk/ports if possible, with + * max_streams_per_circuit streams allowed per rendezvous circuit, + * and circuit closure on max streams being exceeded set by + * max_streams_close_circuit. * * Regardless of sucess/failure, callers should not touch pk/ports after * calling this routine, and may assume that correct cleanup has been done @@ -803,6 +823,8 @@ rend_config_services(const or_options_t *options, int validate_only) rend_service_add_ephemeral_status_t rend_service_add_ephemeral(crypto_pk_t *pk, smartlist_t *ports, + int max_streams_per_circuit, + int max_streams_close_circuit, char **service_id_out) { *service_id_out = NULL; @@ -816,6 +838,8 @@ rend_service_add_ephemeral(crypto_pk_t *pk, s->ports = ports; s->intro_period_started = time(NULL); s->n_intro_points_wanted = NUM_INTRO_POINTS_DEFAULT; + s->max_streams_per_circuit = max_streams_per_circuit; + s->max_streams_close_circuit = max_streams_close_circuit; if (rend_service_derive_key_digests(s) < 0) { rend_service_free(s); return RSAE_BADPRIVKEY; diff --git a/src/or/rendservice.h b/src/or/rendservice.h index ec783d5..b540d2c 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -117,6 +117,8 @@ typedef enum { } rend_service_add_ephemeral_status_t; rend_service_add_ephemeral_status_t rend_service_add_ephemeral(crypto_pk_t *pk, smartlist_t *ports, + int max_streams_per_circuit, + int max_streams_close_circuit, char **service_id_out); int rend_service_del_ephemeral(const char *service_id);

1 0

[tor/master] Add "HiddenServiceMaxStreams" as a per-HS tunable.
by nickm＠torproject.org 21 May '15

21 May '15

commit db7bde08be59398488624bc377d1d5318182ee45 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed May 20 17:33:59 2015 +0000 Add "HiddenServiceMaxStreams" as a per-HS tunable. When set, this limits the maximum number of simultaneous streams per rendezvous circuit on the server side of a HS, with further RELAY_BEGIN cells being silently ignored. This can be modified via "HiddenServiceMaxStreamsCloseCircuit", which if set will cause offending rendezvous circuits to be torn down instead. Addresses part of #16052. --- changes/feature16052 | 5 +++++ doc/tor.1.txt | 10 +++++++++ src/or/circuituse.c | 27 ++++++++++++++++------- src/or/config.c | 2 ++ src/or/connection_edge.c | 2 ++ src/or/or.h | 3 +++ src/or/rendservice.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 94 insertions(+), 8 deletions(-) diff --git a/changes/feature16052 b/changes/feature16052 new file mode 100644 index 0000000..cd09b58 --- /dev/null +++ b/changes/feature16052 @@ -0,0 +1,5 @@ + o Minor features (hidden service): + - Add the new options "HiddenServiceMaxStreams" and + "HiddenServiceMaxStreamsCloseCircuit" to allow hidden services to limit + the maximum number of simultaneous streams per circuit, and optionally + tear down the circuit when the limit is exceeded. Part of ticket 16052. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2bb5f94..13f2bdd 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2149,6 +2149,16 @@ The following options are used to configure a hidden service. not an authorization mechanism; it is instead meant to be a mild inconvenience to port-scanners.) (Default: 0) +[[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__:: + The maximum number of simultaneous streams (connections) per rendezvous + circuit. (Setting this to 0 will allow an unlimited number of simultanous + streams.) (Default: 0) + +[[HiddenServiceMaxStreamsCloseCircuit]] **HiddenServiceMaxStreamsCloseCircuit** **0**|**1**:: + If set to 1, then exceeding **HiddenServiceMaxStreams** will cause the + offending rendezvous circuit to be torn down, as opposed to stream creation + requests that exceed the limit being silently ignored. (Default: 0) + [[RendPostPeriod]] **RendPostPeriod** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: Every time the specified period elapses, Tor uploads any rendezvous service descriptors to the directory servers. This information is also diff --git a/src/or/circuituse.c b/src/or/circuituse.c index b54a4d2..a429a7d 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1189,17 +1189,28 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ); + int removed = 0; if (conn == origin_circ->p_streams) { origin_circ->p_streams = conn->next_stream; - return; + removed = 1; + } else { + for (prevconn = origin_circ->p_streams; + prevconn && prevconn->next_stream && prevconn->next_stream != conn; + prevconn = prevconn->next_stream) + ; + if (prevconn && prevconn->next_stream) { + prevconn->next_stream = conn->next_stream; + removed = 1; + } } - - for (prevconn = origin_circ->p_streams; - prevconn && prevconn->next_stream && prevconn->next_stream != conn; - prevconn = prevconn->next_stream) - ; - if (prevconn && prevconn->next_stream) { - prevconn->next_stream = conn->next_stream; + if (removed) { + /* If the stream was removed, and it was a rend stream, decrement the + * number of streams on the circuit associated with the rend service. + */ + if (circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) { + tor_assert(origin_circ->rend_data); + origin_circ->rend_data->nr_streams--; + } return; } } else { diff --git a/src/or/config.c b/src/or/config.c index 1030448..1c04578 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -286,6 +286,8 @@ static config_var_t option_vars_[] = { VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceAuthorizeClient",LINELIST_S,RendConfigLines, NULL), VAR("HiddenServiceAllowUnknownPorts",LINELIST_S, RendConfigLines, NULL), + VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL), + VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL), V(HiddenServiceStatistics, BOOL, "0"), V(HidServAuth, LINELIST, NULL), V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"), diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index cc6e3d7..c63c350 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2860,6 +2860,8 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) origin_circ->p_streams = n_stream; assert_circuit_ok(circ); + origin_circ->rend_data->nr_streams++; + connection_exit_connect(n_stream); /* For path bias: This circuit was used successfully */ diff --git a/src/or/or.h b/src/or/or.h index 5bb080f..af34967 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -818,6 +818,9 @@ typedef struct rend_data_t { /** List of HSDir fingerprints on which this request has been sent to. * This contains binary identity digest of the directory. */ smartlist_t *hsdirs_fp; + + /** Number of streams associated with this rendezvous circuit. */ + int nr_streams; } rend_data_t; /** Time interval for tracking replays of DH public keys received in diff --git a/src/or/rendservice.c b/src/or/rendservice.c index daca4cc..5d2225e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -147,6 +147,13 @@ typedef struct rend_service_t { /** If true, we don't close circuits for making requests to unsupported * ports. */ int allow_unknown_ports; + /** The maximum number of simultanious streams-per-circuit that are allowed + * to be established, or 0 if no limit is set. + */ + int max_streams_per_circuit; + /** If true, we close circuits that exceed the max_streams_per_circuit + * limit. */ + int max_streams_close_circuit; } rend_service_t; /** Returns a escaped string representation of the service, s. @@ -539,6 +546,33 @@ rend_config_services(const or_options_t *options, int validate_only) log_info(LD_CONFIG, "HiddenServiceDirGroupReadable=%d for %s", service->dir_group_readable, service->directory); + } else if (!strcasecmp(line->key, "HiddenServiceMaxStreams")) { + service->max_streams_per_circuit = (int)tor_parse_long(line->value, + 10, 0, 65535, &ok, NULL); + if (!ok) { + log_warn(LD_CONFIG, + "HiddenServiceMaxStreams should be between 0 and %d, not %s", + 65535, line->value); + rend_service_free(service); + return -1; + } + log_info(LD_CONFIG, + "HiddenServiceMaxStreams=%d for %s", + service->max_streams_per_circuit, service->directory); + } else if (!strcasecmp(line->key, "HiddenServiceMaxStreamsCloseCircuit")) { + service->max_streams_close_circuit = (int)tor_parse_long(line->value, + 10, 0, 1, &ok, NULL); + if (!ok) { + log_warn(LD_CONFIG, + "HiddenServiceMaxStreamsCloseCircuit should be 0 or 1, not %s", + line->value); + rend_service_free(service); + return -1; + } + log_info(LD_CONFIG, + "HiddenServiceMaxStreamsCloseCircuit=%d for %s", + (int)service->max_streams_close_circuit, service->directory); + } else if (!strcasecmp(line->key, "HiddenServiceAuthorizeClient")) { /* Parse auth type and comma-separated list of client names and add a * rend_authorized_client_t for each client to the service's list @@ -3795,6 +3829,25 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, serviceid, (unsigned)circ->base_.n_circ_id); return -2; } + if (service->max_streams_per_circuit > 0) { + /* Enforce the streams-per-circuit limit, and refuse to provide a + * mapping if this circuit will exceed the limit. */ +#define MAX_STREAM_WARN_INTERVAL 600 + static struct ratelim_t stream_ratelim = + RATELIM_INIT(MAX_STREAM_WARN_INTERVAL); + if (circ->rend_data->nr_streams >= service->max_streams_per_circuit) { + log_fn_ratelim(&stream_ratelim, LOG_WARN, LD_REND, + "Maximum streams per circuit limit reached on rendezvous " + "circuit %u; %s. Circuit has %d out of %d streams.", + (unsigned)circ->base_.n_circ_id, + service->max_streams_close_circuit ? + "closing circuit" : + "ignoring open stream request", + circ->rend_data->nr_streams, + service->max_streams_per_circuit); + return service->max_streams_close_circuit ? -2 : -1; + } + } matching_ports = smartlist_new(); SMARTLIST_FOREACH(service->ports, rend_service_port_config_t *, p, {

1 0

[tor/master] fwd-port 0.2.6.8 changelog
by nickm＠torproject.org 21 May '15

21 May '15

commit b668d3017b205527edbcc7360109d0785046b465 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 21 10:42:16 2015 -0400 fwd-port 0.2.6.8 changelog --- ChangeLog | 20 ++++++++++++++++++++ ReleaseNotes | 22 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/ChangeLog b/ChangeLog index c79a399..651d317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,25 @@ Changes in version 0.2.7.2-alpha - 2015-0?-?? +Changes in version 0.2.6.8 - 2015-05-21 + Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and + fixes an authority-side bug in assigning the HSDir flag. All directory + authorities should upgrade. + + o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): + - Revert commit that made directory authorities assign the HSDir + flag to relay without a DirPort; this was bad because such relays + can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix + on tor-0.2.6.3-alpha. + + o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha): + - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on + a client authorized hidden service. Fixes bug 15823; bugfix + on 0.2.1.6-alpha. + + o Minor features (geoip): + - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the April 8 2015 Maxmind GeoLite2 + Country database. Changes in version 0.2.7.1-alpha - 2015-05-12 diff --git a/ReleaseNotes b/ReleaseNotes index 68ce114..99880ce 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,28 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.6.8 - 2015-05-21 + Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and + fixes an authority-side bug in assigning the HSDir flag. All directory + authorities should upgrade. + + o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): + - Revert commit that made directory authorities assign the HSDir + flag to relay without a DirPort; this was bad because such relays + can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix + on tor-0.2.6.3-alpha. + + o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha): + - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on + a client authorized hidden service. Fixes bug 15823; bugfix + on 0.2.1.6-alpha. + + o Minor features (geoip): + - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the April 8 2015 Maxmind GeoLite2 + Country database. + + Changes in version 0.2.6.7 - 2015-04-06 Tor 0.2.6.7 fixes two security issues that could be used by an attacker to crash hidden services, or crash clients visiting hidden

1 0

[tor/release-0.2.6] ChangeLog->releasenotes
by nickm＠torproject.org 21 May '15

21 May '15

commit 2fe3afccb6505dbe0a94767d17be2280226c258e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 21 10:42:03 2015 -0400 ChangeLog->releasenotes --- ReleaseNotes | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ReleaseNotes b/ReleaseNotes index ff32d96..d026d42 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,27 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.6.8 - 2015-05-21 + Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and + fixes an authority-side bug in assigning the HSDir flag. All directory + authorities should upgrade. + + o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): + - Revert commit that made directory authorities assign the HSDir + flag to relay without a DirPort; this was bad because such relays + can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix + on tor-0.2.6.3-alpha. + + o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha): + - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on + a client authorized hidden service. Fixes bug 15823; bugfix + on 0.2.1.6-alpha. + + o Minor features (geoip): + - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the April 8 2015 Maxmind GeoLite2 + Country database. + Changes in version 0.2.6.7 - 2015-04-06 Tor 0.2.6.7 fixes two security issues that could be used by an

1 0

[tor/release-0.2.6] whoops, note the release date
by nickm＠torproject.org 21 May '15

21 May '15

commit 2a38a3f92b7edd8e4de8039005df2d524a8ff486 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 21 10:40:33 2015 -0400 whoops, note the release date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 25ab6e4..8135c78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.6.8 - 2015-05-2? +Changes in version 0.2.6.8 - 2015-05-21 Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and fixes an authority-side bug in assigning the HSDir flag. All directory authorities should upgrade.

1 0

[tor-browser-bundle/master] Bug 16083: Update comment in start-tor-browser
by gk＠torproject.org 21 May '15

21 May '15

commit 30895033d3dc497cf38bfafdcf4aae323327d15f Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 21 12:50:24 2015 +0000 Bug 16083: Update comment in start-tor-browser Thanks, cypherpunk. --- RelativeLink/start-tor-browser | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 940ec96..638c0c0 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -308,8 +308,8 @@ EOF # TOR_CONTROL_PASSWD='"secret"' # # Yes, the variable MUST be double-quoted, then single-quoted, exactly as -# shown. This is used by TorButtom to authenticate to Tor's ControlPort, and -# is necessary for using TBB with a with a system-installed Tor. +# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's +# ControlPort, and is necessary for using TB with a system-installed Tor. # # Additionally, if using a system-installed Tor, the following about:config # options should be set (values in <> mean they are the value taken from your

1 0

[globe/master] Bump Globe version in package.json to 0.4.9.
by isis＠torproject.org 21 May '15

21 May '15

commit 01f90b176ac4541f0a27e12beb1af0ff49328143 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 21 10:35:14 2015 +0000 Bump Globe version in package.json to 0.4.9. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f1a2482..29ef052 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "globe", - "version": "0.4.8", + "version": "0.4.9", "private": true, "scripts": { "start": "node app.js"

1 0

[globe/master] Merge branch 'trac-13084'
by isis＠torproject.org 21 May '15

21 May '15

commit 614c804ddd1188cba61cf9f957b702f0af829663 Merge: 3a92fba fef2cd4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 21 10:20:03 2015 +0000 Merge branch 'trac-13084' src/js/views/HistoryGraphView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[globe/master] Fix switch bandwidith graph labels for read/written bytes.
by isis＠torproject.org 21 May '15

21 May '15

commit fef2cd47cb706270ea6fd1e18e6e3bf21463df05 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 21 10:15:28 2015 +0000 Fix switch bandwidith graph labels for read/written bytes. * FIXES #13084: https://bugs.torproject.org/13084 * THANKS TO arma for finding the bug. --- src/js/views/HistoryGraphView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/views/HistoryGraphView.js b/src/js/views/HistoryGraphView.js index 169a5b4..899ab4a 100644 --- a/src/js/views/HistoryGraphView.js +++ b/src/js/views/HistoryGraphView.js @@ -171,7 +171,7 @@ GLOBE.RelayBandwidthView = GLOBE.HistoryGraphView.extend({ }, title: 'Bandwidth', graphs: ['readHistory', 'writeHistory'], - labels: ['written bytes per second', 'read bytes per second'], + labels: ['read bytes per second', 'written bytes per second'], legendPos: [{x:60,y:25}, {x:270,y:25}] });

1 0