commit d845c0d5a3a59cf5f07209b251166763fc498cc3 Merge: c8155f8 50d71b7 Author: hiromipaw hiro@torproject.org Date: Thu Jan 12 12:58:27 2017 +0100

Merge branch 'submenus' into staging

.gitignore | 2 ++ docs/en/tor-manual-dev.wml | 4 ++-- include/head.wmi | 28 +++++++++++++++------------- 3 files changed, 19 insertions(+), 15 deletions(-)