commit 21cfcd81323a4f4ee3fbec97fc07e0da33b568dc Merge: a41730e 45cab7a Author: Sebastian Hahn sebastian@torproject.org Date: Sun Dec 14 00:40:13 2014 +0100

Merge remote-tracking branch 'ilv/faq_gettor' into staging

docs/en/faq.wml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)