commit a31d658dc08d8d2d8ceea471b372ec0215a5c69e Merge: 60c0202 abb5231 Author: teor teor@torproject.org Date: Thu Aug 1 16:46:22 2019 +1000

Merge remote-tracking branch 'tor-github/pr/5'

CODE_OF_CONDUCT | 7 +++++++ LICENSE | 43 +++++++++++++++++++++++++++++++++++++++++++ README | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+)