commit fbc791d59c8da4ecdef4a3dee6286a16def1c572 Merge: 4aff960 92c372b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 6 20:12:08 2016 -0400 Merge remote-tracking branch 'asn/ticket19972_01' proposals/224-rend-spec-ng.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)