commit 54ef5f2158a00cdf545833ad670d19a1a1536dd7 Merge: 1f0d38a 5491f3f Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 08:35:48 2018 -0400

Merge remote-tracking branch 'teor/bug26925'

rend-spec-v3.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)