commit f435fd933c476a572594b8cc800a199e2edefb70 Merge: 44d698f bb9b5da Author: Sebastian Hahn sebastian@torproject.org Date: Mon Nov 10 02:08:58 2014 +0100

Merge branch 'master' into staging

include/links.wmi | 2 +- projects/torbrowser/design/index.html.en | 432 +++++++++++++++++------------- 2 files changed, 245 insertions(+), 189 deletions(-)