[tor-commits] [atlas/master] Merge branch 'task/21364'

[irl at torproject.org]

commit a5585095ba81548300447bed1b2d6f9c3545aedc
Merge: 7ce8006 f81916a
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Wed Mar 1 17:11:49 2017 +0000

    Merge branch 'task/21364'

 templates/details/bridge.html | 2 +-
 templates/details/router.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc templates/details/bridge.html
index abfb497,c436522..f393ab6
--- a/templates/details/bridge.html
+++ b/templates/details/bridge.html
@@@ -44,7 -44,7 +44,7 @@@
  
      <dt><span class="tip" title="Flags that the directory authorities assigned to this bridge." data-original-title="Bridge flags">Flags</span></dt>
      <dd><% _.each(relay.get('flags'), function(flag) { %>
-     <span class="tip flags" title="<%= flag[0] %><br /><%= flag[2] %>">
 -    <span class="flags" title="<%= flag[2] %>">
++    <span class="tip flags" title="<%= flag[2] %>">
          <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/>
          <span class="inline"><%= flag[0] %></span>
      </span>
diff --cc templates/details/router.html
index 0b20237,208f31a..2ded09a
--- a/templates/details/router.html
+++ b/templates/details/router.html
@@@ -76,7 -76,7 +76,7 @@@
  
      <dt><span class="tip" title="Flags that the directory authorities assigned to this relay." data-original-title="Relay flags">Flags</span></dt>
      <dd><% _.each(relay.get('flags'), function(flag) { %>
-         <span class="tip flags" title="<%= flag[0] %><br /><%= flag[2] %>">
 -        <span class="flags" title="<%= flag[2] %>">
++        <span class="tip flags" title="<%= flag[2] %>">
              <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/>
              <span class="inline"><%= flag[0] %></span>
          </span>