commit 46573d278068dc519d5a7d7473628a824ee6701a Merge: e9ef624 2fdec5a Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 15:15:03 2018 -0400

Merge remote-tracking branch 'asn-github/bug20700_kdf'

rend-spec-v3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)