[tor-commits] [webwml/master] Merge branch 'master' of git-rw.torproject.org:project/web/webwml into irl-patch

[hiro@xxxxxxxxxxxxxx]

commit 5c715e9a3d7d767df3d2d6aa9d1dd98a57aa5173
Merge: 8fa5262a 918e1321
Author: hiromipaw <hiro@xxxxxxxxxxxxxx>
Date:   Wed Feb 7 11:40:27 2018 +0100

    Merge branch 'master' of git-rw.torproject.org:project/web/webwml into irl-patch

 .gitignore                                 |   6 +-
 Makefile                                   |   2 +-
 about/en/contact.wml                       |  21 +-
 about/en/contributors.wml                  |   3 +
 about/en/corepeople.wml                    | 145 +++---
 about/en/jobs.wml                          |  18 +-
 css/donation-banner.css                    |  99 ----
 docs/en/debian.wml                         |   2 +-
 docs/en/rpms.wml                           |  47 --
 docs/en/sidenav.wmi                        |  12 +-
 docs/en/tor-doc-relay.wml                  | 113 +----
 docs/en/tor-doc-unix.wml                   |   6 +-
 docs/en/tor-relay-debian.wml               | 176 +------
 docs/en/verifying-signatures.wml           |   2 +-
 donate/en/donate-options.wml               |   4 +-
 download/en/download-easy.wml              |  20 +
 en/index.wml                               |   2 +-
 getinvolved/en/tshirt.wml                  |   2 +-
 images/onion-hand.png                      | Bin 69055 -> 0 bytes
 images/people/bparker.png                  | Bin 21887 -> 0 bytes
 include/head.wmi                           |  19 -
 include/versions.wmi                       |  14 +-
 js/dlpage01.js                             |   8 +-
 js/donation_banner.js                      |  33 --
 keys/bparker.txt                           |  63 ---
 press/en/press.wml                         |  12 +
 projects/en/torbrowser.wml                 |  11 +-
 projects/torbrowser/RecommendedTBBVersions |  20 +-
 projects/torbrowser/design/index.html.en   | 763 ++++++++++++++++++-----------
 29 files changed, 644 insertions(+), 979 deletions(-)

diff --cc about/en/corepeople.wml
index f7c88533,1e6c86a2..09a6a20b
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@@ -280,11 -271,9 +271,9 @@@
        <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=A8F7BA5041E133339CBA169676D58093F540ABCD";><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
        <div class="name"><a href="#irl">Iain Learmonth</a></div>
        <div class="field"><b>IRC:</b> irl</div>
 -      <div class="description"><a href="https://metrics.torproject.org";>Metrics team member</a> and maintainer of <a href="https://atlas.torproject.org/";>Atlas</a>.</div>
 +      <div class="description"><a href="https://metrics.torproject.org";>Metrics team member</a> and maintainer of <a href="https://atlas.torproject.org/";>Relay Search</a>.</div>
      </td>
-   </tr>
  
-   <tr>
      <td>
        <a id="ian"></a>
        <div class="photo"><img src="$(IMGROOT)/people/ian.png" alt="ian" /></div>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits