diff --git a/modules/legacy/db/tordir.sql b/modules/legacy/db/tordir.sql index f52e89bf1f2d617a7fd15d98429654d2f394e1c3..e5f02f33897f8594d11120e00dd4ea99ef5b385c 100644 --- a/modules/legacy/db/tordir.sql +++ b/modules/legacy/db/tordir.sql @@ -914,7 +914,7 @@ UNION ALL NULL AS bridges FROM relay_platforms WHERE date < current_date - 1) UNION ALL (SELECT date, NULL AS flag, NULL AS country, NULL AS version, - 'FreeBSD' AS platform, NULL AS ec2bridge, avg_bsd AS relays, + 'BSD' AS platform, NULL AS ec2bridge, avg_bsd AS relays, NULL AS bridges FROM relay_platforms WHERE date < current_date - 1) UNION ALL (SELECT date, NULL AS flag, NULL AS country, NULL AS version, diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index c35f1ecc41db7724a8ff2a1083b232a2112f98f0..75680b68b1a82f37f42dbba75956b058048c3d46 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -421,7 +421,7 @@ plot_platforms <- function(start, end, path) { scale_y_continuous(name = "", limits = c(0, max(platforms$value, na.rm = TRUE))) + scale_colour_manual(name = "Platform", - breaks = c("Linux", "Darwin", "FreeBSD", "Windows", "Other"), + breaks = c("Linux", "Darwin", "BSD", "Windows", "Other"), values = c("#E69F00", "#56B4E9", "#009E73", "#0072B2", "#333333")) + opts(title = "Relay platforms\n") ggsave(filename = path, width = 8, height = 5, dpi = 72) diff --git a/website/web/WEB-INF/servers-data.jsp b/website/web/WEB-INF/servers-data.jsp index fb3788b8f13bf588468df4cef1321c3a9c7440be..34ef5528dd9fa2da19c7abcd719e468ae88c3139 100644 --- a/website/web/WEB-INF/servers-data.jsp +++ b/website/web/WEB-INF/servers-data.jsp @@ -57,7 +57,7 @@ regardless of the Tor software version they run. There are no statistics on the number of bridges by Tor software version.
  • platform: Operating system as reported by the relay. -Examples are "Linux", "Darwin" (Mac OS X), "FreeBSD", +Examples are "Linux", "Darwin" (Mac OS X), "BSD", "Windows", and "Other". If this column contains the empty string, all running relays are included, regardless of the operating system they run on.