commit 87957c30924ef9be56d7614b87fc5ab03d59b18f Merge: fac37d8 897132e Author: Arturo Filastò arturo@filasto.net Date: Mon Mar 16 17:29:06 2015 +0100

Merge pull request #36 from TheTorProject/feature/informed-consent

Feature/informed consent

informed-consent/inform-users-long.md | 75 ++++++++++++++++++++++++++++++++ informed-consent/inform-users-short.md | 8 ++++ 2 files changed, 83 insertions(+)