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

[arma at torproject.org]

commit fd56b785c6300a0b675bcd30424c6a3c67472b9f
Merge: fea31a2 5628d54
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon May 4 22:35:33 2015 -0400

    Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
    
    Conflicts:
    	press/en/info.wmi

 Makefile                                   |    4 +-
 about/en/board.wml                         |  120 +++---
 about/en/contact.wml                       |   20 +-
 about/en/corepeople.wml                    |   28 +-
 about/en/gsoc.wml                          |    6 +-
 about/en/overview.wml                      |   51 +--
 about/en/sponsors.wml                      |    7 +-
 about/en/torusers.wml                      |   76 ++--
 about/en/volunteers.wml                    |   18 +-
 css/layout.css                             |   15 +-
 docs/en/bridges.wml                        |   10 +-
 docs/en/debian.wml                         |  240 +++++++++++-
 docs/en/faq.wml                            |   22 +-
 docs/en/hidden-services.wml                |   40 +-
 docs/en/pluggable-transports.wml           |    2 +-
 docs/en/running-a-mirror.wml               |    4 +-
 docs/en/signing-keys.wml                   |   11 +-
 docs/en/tor-doc-osx.wml                    |  131 +++----
 docs/en/tor-doc-relay.wml                  |    6 +-
 docs/en/tor-doc-unix.wml                   |   22 +-
 docs/en/tor-doc-windows.wml                |   51 +--
 docs/en/tor-hidden-service.wml             |   18 +-
 docs/en/verifying-signatures.wml           |  132 ++++---
 docs/torbutton/en/design/design.xml        |    4 +-
 docs/torbutton/en/design/index.html.en     |    4 +-
 donate/en/donate.wml                       |   12 +-
 download/en/download-easy.wml              |   30 +-
 download/en/download.wml                   |   10 +-
 getinvolved/en/relays.wml                  |   34 +-
 getinvolved/en/tshirt.wml                  |    4 +-
 getinvolved/en/volunteer.wml               |  208 ++++------
 images/tbb-macosx-step-1.png               |  Bin 0 -> 21334 bytes
 images/tbb-macosx-step-2.png               |  Bin 0 -> 20451 bytes
 images/tbb-macosx-step-3.png               |  Bin 0 -> 13846 bytes
 include/dlhead.wmi                         |    4 +-
 include/mirrors-table.wmi                  |  302 +++++++--------
 include/tor-mirrors.csv                    |  150 ++++----
 include/versions.wmi                       |   30 +-
 press/en/info.wmi                          |    5 +
 press/en/press.wml                         |   60 +++
 projects/en/gettor.wml                     |   93 +----
 projects/en/obfsproxy.wml                  |    2 +-
 projects/en/torbrowser.wml                 |   78 ++--
 projects/torbrowser/RecommendedTBBVersions |   20 +-
 projects/torbrowser/design/index.html.en   |  562 +++++++++++++++++-----------
 45 files changed, 1419 insertions(+), 1227 deletions(-)

diff --cc press/en/info.wmi
index 5429016,9c9e307..52968ff
--- a/press/en/info.wmi
+++ b/press/en/info.wmi
@@@ -7,7 -7,8 +7,12 @@@
      <h2 class="media">Press Contact</h2>
      <p>
      <b>Tor Press Team</b><br>
++<<<<<<< HEAD
 +    execdir at torproject.org<br>
++=======
+     press at torproject.org<br>
+     +1-617-902-0208
++>>>>>>> 5628d54898b63540d5df3179261a9cdd591fd970
      </p>
      </div>
     <!-- END INFOBLOCK -->