commit 36b3b2cc06d50c3290c445501a3ceb8d55bb0415 Merge: 54346bf 2df60b7 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 13 13:31:23 2020 -0500 Merge remote-tracking branch 'tor-github/pr/96' .gitlab-ci.yml | 52 ++++++++++++++++++++++++++++++ bridgedb-spec.txt | 3 ++ control-spec.txt | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ dir-list-spec.txt | 2 ++ dir-spec.txt | 59 ++++++++++++++++++++++++++++++++++ guard-spec.txt | 3 ++ padding-spec.txt | 2 ++ path-spec.txt | 4 +++ rend-spec-v2.txt | 12 +++++++ rend-spec-v3.txt | 14 +++++++++ srv-spec.txt | 3 ++ tor-spec.txt | 51 ++++++++++++++++++++++++++++++ version-spec.txt | 4 +++ 13 files changed, 303 insertions(+)