[tor-commits] [webwml/master] Merge branch 'staging'

[sebastian at torproject.org]

commit dc9009b3741cf9f262359739e087f5eb89f23432
Merge: ab0918c 1700644
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Dec 11 14:01:11 2014 +0100

    Merge branch 'staging'

 about/en/corepeople.wml              |    2 +-
 about/en/jobs-coredev.wml            |    2 +-
 about/en/jobs-pluggabletransport.wml |    2 +-
 docs/en/faq.wml                      |   10 +++++-----
 docs/en/pluggable-transports.wml     |   10 +++++-----
 docs/en/tor-doc-relay.wml            |    2 +-
 docs/torbutton/en/index.wml          |    6 +++---
 eff/en/tor-legal-faq.wml             |    2 +-
 getinvolved/en/volunteer.wml         |    2 +-
 projects/en/obfsproxy.wml            |    2 +-
 projects/en/torbrowser.wml           |    4 ++--
 projects/en/tordnsel.wml             |    2 +-
 projects/en/vidalia.wml              |    2 +-
 13 files changed, 24 insertions(+), 24 deletions(-)