commit 2b47d247b3ac6da3ce78c67df4a07fc895cb5fd0 Merge: e899eab 2bdcf78 Author: George Kadianakis desnacked@riseup.net Date: Mon Dec 2 12:46:27 2019 +0200

Merge remote-tracking branch 'dgoulet/ticket32617_01'

dir-spec.txt | 5 ++ proposals/000-index.txt | 4 +- .../305-establish-intro-dos-defense-extention.txt | 2 +- rend-spec-v3.txt | 62 ++++++++++++++++++++++ tor-spec.txt | 3 ++ 5 files changed, 73 insertions(+), 3 deletions(-)