commit 048f26a007e54d811c6577143ab8cb6fd7bc92bb Merge: e788b8f bd8b94b Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 1 13:00:29 2016 -0400

Merge remote-tracking branch 'dgoulet/ticket20278_01'

cert-spec.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)