commit 40145e3ab70c8072aaf437ed89162495f0fb1e3a Merge: 1e42e69 5dcef2e Author: Sebastian Hahn <sebastian@torproject.org> Date: Wed Feb 11 06:44:48 2015 +0100 Merge remote-tracking branch 'ilv/install_config_relay' docs/en/tor-doc-osx.wml | 19 +++---------------- docs/en/tor-doc-unix.wml | 20 +++----------------- docs/en/tor-doc-windows.wml | 26 +++----------------------- 3 files changed, 9 insertions(+), 56 deletions(-)