[tor-commits] [metrics-web/master] Add new logo and wordmark by Leiah and Rob.

karsten at torproject.org karsten at torproject.org
Sat Sep 26 19:07:07 UTC 2015


commit 46bb0b92e08671d4e1ce78d7293ed73a9c9eede0
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Sat Sep 26 21:01:24 2015 +0200

    Add new logo and wordmark by Leiah and Rob.
---
 website/web/WEB-INF/about.jsp                       |    2 +-
 website/web/WEB-INF/advbwdist-data.jsp              |    2 +-
 website/web/WEB-INF/advbwdist-perc.jsp              |    2 +-
 website/web/WEB-INF/advbwdist-relay.jsp             |    2 +-
 website/web/WEB-INF/bandwidth-data.jsp              |    2 +-
 website/web/WEB-INF/bandwidth-flags.jsp             |    2 +-
 website/web/WEB-INF/bandwidth.jsp                   |    2 +-
 website/web/WEB-INF/bubbles.jsp                     |    2 +-
 website/web/WEB-INF/bwhist-flags.jsp                |    2 +-
 website/web/WEB-INF/clients-data.jsp                |    2 +-
 website/web/WEB-INF/cloudbridges.jsp                |    2 +-
 website/web/WEB-INF/connbidirect-data.jsp           |    2 +-
 website/web/WEB-INF/connbidirect.jsp                |    2 +-
 website/web/WEB-INF/connbidirect2-data.jsp          |    2 +-
 website/web/WEB-INF/dir.jsp                         |    2 +-
 website/web/WEB-INF/dirbytes.jsp                    |    2 +-
 website/web/WEB-INF/error.jsp                       |    2 +-
 website/web/WEB-INF/hidserv-data.jsp                |    2 +-
 website/web/WEB-INF/hidserv-dir-onions-seen.jsp     |    2 +-
 website/web/WEB-INF/hidserv-frac-reporting.jsp      |    2 +-
 website/web/WEB-INF/hidserv-rend-relayed-cells.jsp  |    2 +-
 website/web/WEB-INF/index.jsp                       |    2 +-
 website/web/WEB-INF/network.jsp                     |    2 +-
 website/web/WEB-INF/networksize.jsp                 |    2 +-
 website/web/WEB-INF/oxford-anonymous-internet.jsp   |    2 +-
 website/web/WEB-INF/performance.jsp                 |    2 +-
 website/web/WEB-INF/platforms.jsp                   |    2 +-
 website/web/WEB-INF/relayflags.jsp                  |    2 +-
 website/web/WEB-INF/servers-data.jsp                |    2 +-
 website/web/WEB-INF/stats.jsp                       |    2 +-
 website/web/WEB-INF/torperf-data.jsp                |    2 +-
 website/web/WEB-INF/torperf-failures.jsp            |    2 +-
 website/web/WEB-INF/torperf.jsp                     |    2 +-
 website/web/WEB-INF/uncharted-data-flow.jsp         |    2 +-
 website/web/WEB-INF/users.jsp                       |    2 +-
 website/web/WEB-INF/userstats-bridge-country.jsp    |    2 +-
 website/web/WEB-INF/userstats-bridge-table.jsp      |    2 +-
 website/web/WEB-INF/userstats-bridge-transport.jsp  |    2 +-
 website/web/WEB-INF/userstats-bridge-version.jsp    |    2 +-
 website/web/WEB-INF/userstats-censorship-events.jsp |    2 +-
 website/web/WEB-INF/userstats-relay-country.jsp     |    2 +-
 website/web/WEB-INF/userstats-relay-table.jsp       |    2 +-
 website/web/WEB-INF/versions.jsp                    |    6 +++---
 website/web/images/metrics-logo.png                 |  Bin 0 -> 41165 bytes
 website/web/images/metrics-wordmark-small.png       |  Bin 0 -> 4473 bytes
 website/web/images/metrics-wordmark.png             |  Bin 0 -> 17612 bytes
 website/web/images/top-left.png                     |  Bin 11137 -> 0 bytes
 website/web/images/top-middle.png                   |  Bin 240 -> 0 bytes
 website/web/images/top-right.png                    |  Bin 607 -> 0 bytes
 49 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp
index 84e5261..b95da77 100644
--- a/website/web/WEB-INF/about.jsp
+++ b/website/web/WEB-INF/about.jsp
@@ -10,7 +10,7 @@
   <div class="center">
     <%@ include file="banner.jsp"%>
     <div class="main-column">
-<h2><a href="/">Tor Metrics</a> — About</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — About</h2>
 <br>
 
 <h3>Frequently used terms</h3>
diff --git a/website/web/WEB-INF/advbwdist-data.jsp b/website/web/WEB-INF/advbwdist-data.jsp
index c7d1768..7b9ba12 100644
--- a/website/web/WEB-INF/advbwdist-data.jsp
+++ b/website/web/WEB-INF/advbwdist-data.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Advertised bandwidth distribution and n-th fastest
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Advertised bandwidth distribution and n-th fastest
 relays</h2>
 <br>
 <p>The following data file contains statistics on the distribution of
diff --git a/website/web/WEB-INF/advbwdist-perc.jsp b/website/web/WEB-INF/advbwdist-perc.jsp
index 8b5352d..8532019 100644
--- a/website/web/WEB-INF/advbwdist-perc.jsp
+++ b/website/web/WEB-INF/advbwdist-perc.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Advertised bandwidth distribution</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Advertised bandwidth distribution</h2>
 <br>
 <p>The following graph shows the distribution of the
 <a href="about.html#advertised-bandwidth">advertised bandwidth</a> of
diff --git a/website/web/WEB-INF/advbwdist-relay.jsp b/website/web/WEB-INF/advbwdist-relay.jsp
index a62ca37..b3de6c5 100644
--- a/website/web/WEB-INF/advbwdist-relay.jsp
+++ b/website/web/WEB-INF/advbwdist-relay.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Advertised bandwidth of n-th fastest relays</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Advertised bandwidth of n-th fastest relays</h2>
 <br>
 <p>The following graph shows the
 <a href="about.html#advertised-bandwidth">advertised bandwidth</a> of the
diff --git a/website/web/WEB-INF/bandwidth-data.jsp b/website/web/WEB-INF/bandwidth-data.jsp
index 2499e4a..cbb0271 100644
--- a/website/web/WEB-INF/bandwidth-data.jsp
+++ b/website/web/WEB-INF/bandwidth-data.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Bandwidth provided and consumed by relays</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Bandwidth provided and consumed by relays</h2>
 <br>
 <p>The following data file contains statistics on
 <a href="about.html#advertised-bandwidth">advertised</a> and
diff --git a/website/web/WEB-INF/bandwidth-flags.jsp b/website/web/WEB-INF/bandwidth-flags.jsp
index 1cf591f..ca1905c 100644
--- a/website/web/WEB-INF/bandwidth-flags.jsp
+++ b/website/web/WEB-INF/bandwidth-flags.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Advertised bandwidth and bandwidth history by relay flags</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Advertised bandwidth and bandwidth history by relay flags</h2>
 <br>
 <p>The following graph shows
 <a href="about.html#advertised-bandwidth">advertised</a> and
diff --git a/website/web/WEB-INF/bandwidth.jsp b/website/web/WEB-INF/bandwidth.jsp
index cbebe0a..59acef6 100644
--- a/website/web/WEB-INF/bandwidth.jsp
+++ b/website/web/WEB-INF/bandwidth.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Total relay bandwidth in the network</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Total relay bandwidth in the network</h2>
 <br>
 <p>The following graph shows the total
 <a href="about.html#advertised-bandwidth">advertised</a> and
diff --git a/website/web/WEB-INF/bubbles.jsp b/website/web/WEB-INF/bubbles.jsp
index e8d0303..a18e127 100644
--- a/website/web/WEB-INF/bubbles.jsp
+++ b/website/web/WEB-INF/bubbles.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Network bubble graphs</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Network bubble graphs</h2>
 <br>
 <p>The following graph visualizes diversity of currently running
 <a href="about.html#relay">relays</a> in terms of their probability to be
diff --git a/website/web/WEB-INF/bwhist-flags.jsp b/website/web/WEB-INF/bwhist-flags.jsp
index e7bf330..26b38cd 100644
--- a/website/web/WEB-INF/bwhist-flags.jsp
+++ b/website/web/WEB-INF/bwhist-flags.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Relay bandwidth by Exit and/or Guard flags</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Relay bandwidth by Exit and/or Guard flags</h2>
 <br>
 <p>The following graph shows the
 <a href="about.html#bandwidth-history">consumed bandwidth</a> reported by
diff --git a/website/web/WEB-INF/clients-data.jsp b/website/web/WEB-INF/clients-data.jsp
index a6dcbc3..5f64d37 100644
--- a/website/web/WEB-INF/clients-data.jsp
+++ b/website/web/WEB-INF/clients-data.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Estimated number of clients in the Tor network</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Estimated number of clients in the Tor network</h2>
 <br>
 <p>The following data file contains estimates on the number of
 <a href="about.html#client">clients</a> in the network.
diff --git a/website/web/WEB-INF/cloudbridges.jsp b/website/web/WEB-INF/cloudbridges.jsp
index df80a34..73516c5 100644
--- a/website/web/WEB-INF/cloudbridges.jsp
+++ b/website/web/WEB-INF/cloudbridges.jsp
@@ -15,7 +15,7 @@
     <div class="main-column">
 
 <a name="cloudbridges"></a>
-<h2><a href="/">Tor Metrics</a> — Tor Cloud bridges</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Tor Cloud bridges</h2>
 <br>
 <p>The following graph shows the number of running
 <a href="about.html#bridge">bridges</a> that are deployed in
diff --git a/website/web/WEB-INF/connbidirect-data.jsp b/website/web/WEB-INF/connbidirect-data.jsp
index 8b7d9ed..8c32fc5 100644
--- a/website/web/WEB-INF/connbidirect-data.jsp
+++ b/website/web/WEB-INF/connbidirect-data.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Fraction of connections used uni-/bidirectionally (deprecated)</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Fraction of connections used uni-/bidirectionally (deprecated)</h2>
 <br>
 <p><font color="red">As of August 25, 2015, this page and the linked data
 file have been replaced by <a href="connbidirect2-data.html">this page and
diff --git a/website/web/WEB-INF/connbidirect.jsp b/website/web/WEB-INF/connbidirect.jsp
index 6ed512b..958642c 100644
--- a/website/web/WEB-INF/connbidirect.jsp
+++ b/website/web/WEB-INF/connbidirect.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Fraction of connections used uni-/bidirectionally</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Fraction of connections used uni-/bidirectionally</h2>
 <br>
 <p>The following graph shows the fraction of direct connections between a
 <a href="about.html#relay">relay</a> and other nodes in the network that
diff --git a/website/web/WEB-INF/connbidirect2-data.jsp b/website/web/WEB-INF/connbidirect2-data.jsp
index f29373a..0209f6a 100644
--- a/website/web/WEB-INF/connbidirect2-data.jsp
+++ b/website/web/WEB-INF/connbidirect2-data.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Fraction of connections used uni-/bidirectionally</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Fraction of connections used uni-/bidirectionally</h2>
 <br>
 <p>The following data file contains statistics on the fraction of direct
 connections between a <a href="about.html#relay">relay</a> and other nodes
diff --git a/website/web/WEB-INF/dir.jsp b/website/web/WEB-INF/dir.jsp
index 9aa3cb9..4c7a20d 100644
--- a/website/web/WEB-INF/dir.jsp
+++ b/website/web/WEB-INF/dir.jsp
@@ -11,7 +11,7 @@
   <div class="center">
     <%@ include file="banner.jsp"%>
     <div class="main-column">
-        <h2><a href="/">Tor Metrics</a> — Index of ${directory}</h2>
+        <h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Index of ${directory}</h2>
         <br>
         <c:forEach var="file" items="${files}" >
           <a href="${directory}/${file}${extension}">${file}${extension}</a><br>
diff --git a/website/web/WEB-INF/dirbytes.jsp b/website/web/WEB-INF/dirbytes.jsp
index c13d071..95fef8b 100644
--- a/website/web/WEB-INF/dirbytes.jsp
+++ b/website/web/WEB-INF/dirbytes.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Number of bytes spent on answering directory requests</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Number of bytes spent on answering directory requests</h2>
 <br>
 <p>The following graph shows the portion of
 <a href="about.html#bandwidth-history">consumed bandwidth</a> that
diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp
index a712ef1..b42ae99 100644
--- a/website/web/WEB-INF/error.jsp
+++ b/website/web/WEB-INF/error.jsp
@@ -12,7 +12,7 @@
   <div class="center">
     <%@ include file="banner.jsp"%>
     <div class="main-column">
-<h2><a href="/">Tor Metrics</a> — Error</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Error</h2>
 <br>
 <p>
 Oops! Something went wrong here! We encountered a
diff --git a/website/web/WEB-INF/hidserv-data.jsp b/website/web/WEB-INF/hidserv-data.jsp
index f8ccdf2..44c2822 100644
--- a/website/web/WEB-INF/hidserv-data.jsp
+++ b/website/web/WEB-INF/hidserv-data.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Hidden-service statistics</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Hidden-service statistics</h2>
 <br>
 <p>
 The following data file contains
diff --git a/website/web/WEB-INF/hidserv-dir-onions-seen.jsp b/website/web/WEB-INF/hidserv-dir-onions-seen.jsp
index 6983538..95eaa79 100644
--- a/website/web/WEB-INF/hidserv-dir-onions-seen.jsp
+++ b/website/web/WEB-INF/hidserv-dir-onions-seen.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Unique .onion addresses</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Unique .onion addresses</h2>
 <br>
 <p>The following graph shows the number of unique .onion addresses in
 the network per day.
diff --git a/website/web/WEB-INF/hidserv-frac-reporting.jsp b/website/web/WEB-INF/hidserv-frac-reporting.jsp
index d1cc30d..2bb6e80 100644
--- a/website/web/WEB-INF/hidserv-frac-reporting.jsp
+++ b/website/web/WEB-INF/hidserv-frac-reporting.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Fraction of relays reporting hidden-service statistics</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Fraction of relays reporting hidden-service statistics</h2>
 <br>
 <p>The following graph shows the fraction of
 <a href="about.html#relay">relays</a> that report statistics on
diff --git a/website/web/WEB-INF/hidserv-rend-relayed-cells.jsp b/website/web/WEB-INF/hidserv-rend-relayed-cells.jsp
index 7c7f89a..4a24b05 100644
--- a/website/web/WEB-INF/hidserv-rend-relayed-cells.jsp
+++ b/website/web/WEB-INF/hidserv-rend-relayed-cells.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Hidden-service traffic</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Hidden-service traffic</h2>
 <br>
 <p>The following graph shows the amount of hidden-service traffic in the
 network per day.
diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp
index 9ea7e00..5d77601 100644
--- a/website/web/WEB-INF/index.jsp
+++ b/website/web/WEB-INF/index.jsp
@@ -12,7 +12,7 @@
   <div class="center">
     <%@ include file="banner.jsp"%>
     <div class="main-column">
-        <h2><a href="/">Tor Metrics</a></h2>
+        <h2><a href="/"><img src="/images/metrics-logo.png" width="153" height="200" alt="Metrics logo"><img src="/images/metrics-wordmark.png" width="384" height="50" alt="Metrics wordmark"></a></h2>
         <br>
         <p>Welcome to Tor Metrics, the primary place to learn interesting
         facts about the Tor network, the largest deployed anonymity
diff --git a/website/web/WEB-INF/network.jsp b/website/web/WEB-INF/network.jsp
index 4b43420..99d11f9 100644
--- a/website/web/WEB-INF/network.jsp
+++ b/website/web/WEB-INF/network.jsp
@@ -13,7 +13,7 @@
   <div class="center">
     <%@ include file="banner.jsp"%>
     <div class="main-column">
-<h2><a href="/">Tor Metrics</a> — Servers</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Servers</h2>
 <br>
 
 <p>The graphs on this page have moved to their own subpages.
diff --git a/website/web/WEB-INF/networksize.jsp b/website/web/WEB-INF/networksize.jsp
index 24d00d8..095d390 100644
--- a/website/web/WEB-INF/networksize.jsp
+++ b/website/web/WEB-INF/networksize.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Relays and bridges in the network</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Relays and bridges in the network</h2>
 <br>
 <p>The following graph shows the number of running
 <a href="about.html#relay">relays</a> and
diff --git a/website/web/WEB-INF/oxford-anonymous-internet.jsp b/website/web/WEB-INF/oxford-anonymous-internet.jsp
index 3fa46d6..a81e84b 100644
--- a/website/web/WEB-INF/oxford-anonymous-internet.jsp
+++ b/website/web/WEB-INF/oxford-anonymous-internet.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Tor users as percentage of larger Internet population</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Tor users as percentage of larger Internet population</h2>
 <br>
 <p>The Oxford Internet Institute made a cartogram visualization of Tor
 users as compared to the overall Internet population.
diff --git a/website/web/WEB-INF/performance.jsp b/website/web/WEB-INF/performance.jsp
index 37e05a1..4ab0fb3 100644
--- a/website/web/WEB-INF/performance.jsp
+++ b/website/web/WEB-INF/performance.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Performance</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Performance</h2>
 <br>
 <p>The graphs on this page have moved to their own subpages.
 This is part of an effort to make navigation on this website more intuitive.
diff --git a/website/web/WEB-INF/platforms.jsp b/website/web/WEB-INF/platforms.jsp
index 2a223c0..772af21 100644
--- a/website/web/WEB-INF/platforms.jsp
+++ b/website/web/WEB-INF/platforms.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Relays by platform</a></h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Relays by platform</a></h2>
 <br>
 <p>The following graph shows the number of running
 <a href="about.html#relay">relays</a> by operating system.
diff --git a/website/web/WEB-INF/relayflags.jsp b/website/web/WEB-INF/relayflags.jsp
index d0c3e1f..cb59302 100644
--- a/website/web/WEB-INF/relayflags.jsp
+++ b/website/web/WEB-INF/relayflags.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Relays with Exit, Fast, Guard, Stable, and HSDir flags</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Relays with Exit, Fast, Guard, Stable, and HSDir flags</h2>
 <br>
 
 <p>The following graph shows the number of running
diff --git a/website/web/WEB-INF/servers-data.jsp b/website/web/WEB-INF/servers-data.jsp
index a28269f..fb3788b 100644
--- a/website/web/WEB-INF/servers-data.jsp
+++ b/website/web/WEB-INF/servers-data.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Number of relays and bridges</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Number of relays and bridges</h2>
 <br>
 <p>The following data file contains the number of running
 <a href="about.html#relay">relays</a> and
diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp
index ef8319b..3e5026a 100644
--- a/website/web/WEB-INF/stats.jsp
+++ b/website/web/WEB-INF/stats.jsp
@@ -11,7 +11,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Statistics</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Statistics</h2>
 <br>
 <p>The data file specifications on this page have moved to their own subpages.
 This is part of an effort to make navigation on this website more intuitive.
diff --git a/website/web/WEB-INF/torperf-data.jsp b/website/web/WEB-INF/torperf-data.jsp
index 4688d72..3a7e605 100644
--- a/website/web/WEB-INF/torperf-data.jsp
+++ b/website/web/WEB-INF/torperf-data.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Performance of downloading static files over Tor</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Performance of downloading static files over Tor</h2>
 <br>
 <p>The following data file contains aggregate statistics on performance
 when downloading static files of different sizes over Tor.
diff --git a/website/web/WEB-INF/torperf-failures.jsp b/website/web/WEB-INF/torperf-failures.jsp
index 154423f..5619278 100644
--- a/website/web/WEB-INF/torperf-failures.jsp
+++ b/website/web/WEB-INF/torperf-failures.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Timeouts and failures of downloading files over Tor</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Timeouts and failures of downloading files over Tor</h2>
 <br>
 <p>The following graph shows the fraction of timeouts and failures when
 downloading static files of different sizes over Tor.
diff --git a/website/web/WEB-INF/torperf.jsp b/website/web/WEB-INF/torperf.jsp
index 562c210..99f0635 100644
--- a/website/web/WEB-INF/torperf.jsp
+++ b/website/web/WEB-INF/torperf.jsp
@@ -13,7 +13,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Time to download files over Tor</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Time to download files over Tor</h2>
 <br>
 <p>The following graph shows overall performance when downloading static
 files of different sizes over Tor.
diff --git a/website/web/WEB-INF/uncharted-data-flow.jsp b/website/web/WEB-INF/uncharted-data-flow.jsp
index 4b9e9b0..2e0febb 100644
--- a/website/web/WEB-INF/uncharted-data-flow.jsp
+++ b/website/web/WEB-INF/uncharted-data-flow.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Data flow in the Tor network</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Data flow in the Tor network</h2>
 <br>
 <p>Uncharted made a visualization of data flow in the Tor network where
 they place each <a href="about.html#relay">relay</a> on a world map and
diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp
index 0b693a4..25e8f02 100644
--- a/website/web/WEB-INF/users.jsp
+++ b/website/web/WEB-INF/users.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Users</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Users</h2>
 <br>
 
 <p>The graphs and tables on this page have moved to their own subpages.
diff --git a/website/web/WEB-INF/userstats-bridge-country.jsp b/website/web/WEB-INF/userstats-bridge-country.jsp
index 173e934..ce96b97 100644
--- a/website/web/WEB-INF/userstats-bridge-country.jsp
+++ b/website/web/WEB-INF/userstats-bridge-country.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Bridge users by country</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Bridge users by country</h2>
 <br>
 <p>The following graph shows the estimated number of
 <a href="about.html#client">clients</a> connecting via
diff --git a/website/web/WEB-INF/userstats-bridge-table.jsp b/website/web/WEB-INF/userstats-bridge-table.jsp
index f334fee..ff7d6d8 100644
--- a/website/web/WEB-INF/userstats-bridge-table.jsp
+++ b/website/web/WEB-INF/userstats-bridge-table.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Top-10 countries by bridge users</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Top-10 countries by bridge users</h2>
 <br>
 <p>The following table shows the top-10 countries by estimated number of
 <a href="about.html#client">clients</a> connecting via
diff --git a/website/web/WEB-INF/userstats-bridge-transport.jsp b/website/web/WEB-INF/userstats-bridge-transport.jsp
index 1a8ad88..9ca1543 100644
--- a/website/web/WEB-INF/userstats-bridge-transport.jsp
+++ b/website/web/WEB-INF/userstats-bridge-transport.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Bridge users by transport</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Bridge users by transport</h2>
 <br>
 <p>The following graph shows the estimated number of
 <a href="about.html#client">clients</a> connecting via
diff --git a/website/web/WEB-INF/userstats-bridge-version.jsp b/website/web/WEB-INF/userstats-bridge-version.jsp
index a8ab0c3..d14d53b 100644
--- a/website/web/WEB-INF/userstats-bridge-version.jsp
+++ b/website/web/WEB-INF/userstats-bridge-version.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Bridge users by IP version</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Bridge users by IP version</h2>
 <br>
 <p>The following graph shows the estimated number of
 <a href="about.html#client">clients</a> connecting via
diff --git a/website/web/WEB-INF/userstats-censorship-events.jsp b/website/web/WEB-INF/userstats-censorship-events.jsp
index c08a2b0..89ae9a8 100644
--- a/website/web/WEB-INF/userstats-censorship-events.jsp
+++ b/website/web/WEB-INF/userstats-censorship-events.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Top-10 countries by possible censorship events</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Top-10 countries by possible censorship events</h2>
 <br>
 <p>The following table shows the top-10 countries by possible censorship
 events, as obtained from an anomaly-based censorship-detection system (for
diff --git a/website/web/WEB-INF/userstats-relay-country.jsp b/website/web/WEB-INF/userstats-relay-country.jsp
index 76b07ba..55231b3 100644
--- a/website/web/WEB-INF/userstats-relay-country.jsp
+++ b/website/web/WEB-INF/userstats-relay-country.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Direct users by country</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Direct users by country</h2>
 <br>
 <p>The following graph shows the estimated number of directly-connecting
 <a href="about.html#client">clients</a>; that is, it excludes clients
diff --git a/website/web/WEB-INF/userstats-relay-table.jsp b/website/web/WEB-INF/userstats-relay-table.jsp
index 03431fa..3a32510 100644
--- a/website/web/WEB-INF/userstats-relay-table.jsp
+++ b/website/web/WEB-INF/userstats-relay-table.jsp
@@ -14,7 +14,7 @@
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Top-10 countries by directly connecting users</h2>
+<h2><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Top-10 countries by directly connecting users</h2>
 <br>
 <p>The following table shows the top-10 countries by estimated number of
 directly-connecting <a href="about.html#client">clients</a>.
diff --git a/website/web/WEB-INF/versions.jsp b/website/web/WEB-INF/versions.jsp
index 82e3401..c129ef9 100644
--- a/website/web/WEB-INF/versions.jsp
+++ b/website/web/WEB-INF/versions.jsp
@@ -6,15 +6,15 @@
 <head>
   <title>Tor Metrics — Relays by version</title>
   <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-  <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
-  <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
+  <link href="../css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
+  <link href="../images/favicon.ico" type="image/x-icon" rel="shortcut icon">
 </head>
 <body>
   <div class="center">
     <%@ include file="banner.jsp"%>
     <div class="main-column">
 
-<h2><a href="/">Tor Metrics</a> — Relays by version</h2>
+<h2><a href="/"><img src="../images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Relays by version</h2>
 <br>
 <p>The following graph shows the number of running
 <a href="about.html#relay">relays</a> by tor software version.
diff --git a/website/web/images/metrics-logo.png b/website/web/images/metrics-logo.png
new file mode 100644
index 0000000..7f236d6
Binary files /dev/null and b/website/web/images/metrics-logo.png differ
diff --git a/website/web/images/metrics-wordmark-small.png b/website/web/images/metrics-wordmark-small.png
new file mode 100644
index 0000000..d2132d1
Binary files /dev/null and b/website/web/images/metrics-wordmark-small.png differ
diff --git a/website/web/images/metrics-wordmark.png b/website/web/images/metrics-wordmark.png
new file mode 100644
index 0000000..c6977a0
Binary files /dev/null and b/website/web/images/metrics-wordmark.png differ
diff --git a/website/web/images/top-left.png b/website/web/images/top-left.png
deleted file mode 100644
index 9927355..0000000
Binary files a/website/web/images/top-left.png and /dev/null differ
diff --git a/website/web/images/top-middle.png b/website/web/images/top-middle.png
deleted file mode 100644
index 1035dc5..0000000
Binary files a/website/web/images/top-middle.png and /dev/null differ
diff --git a/website/web/images/top-right.png b/website/web/images/top-right.png
deleted file mode 100644
index 54623ef..0000000
Binary files a/website/web/images/top-right.png and /dev/null differ



More information about the tor-commits mailing list