[tor-commits] [torspec/master] Merge branch 'rend-ng-descriptors_squashed'

[nickm at torproject.org]

commit a43c172b6b7cfbe0f94779bcbbf8c6e83087cf71
Merge: a3c4068 8df8c05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 20 10:38:35 2015 -0500

    Merge branch 'rend-ng-descriptors_squashed'

 proposals/224-rend-spec-ng.txt |  199 +++++++++++++++++++++++++++++++---------
 1 file changed, 156 insertions(+), 43 deletions(-)