commit 165efdd9fe9dbbcd41b84a36b9df9f7839e89640 Merge: c0ce11e 32700e0 Author: Sebastian Hahn sebastian@torproject.org Date: Sat Dec 20 16:17:38 2014 +0100

Merge remote-tracking branch 'mttp/Bundle-removal' into staging

about/en/overview.wml | 4 +- docs/en/documentation.wml | 2 +- docs/en/faq.wml | 69 +++++++++++++++---------------- docs/en/tor-doc-relay.wml | 2 +- docs/en/tor-doc-unix.wml | 6 +-- docs/en/verifying-signatures.wml | 12 +++--- docs/torbutton/en/index.wml | 8 ++-- docs/torbutton/en/torbutton-faq.wml | 8 ++-- docs/torbutton/en/torbutton-options.wml | 8 ++-- download/en/download-unix.wml | 5 +-- projects/en/projects.wml | 4 +- 11 files changed, 62 insertions(+), 66 deletions(-)