commit bf9c087ec53e60bc203fa02374a2b7707e61a14f Merge: 1467e33 f439d98 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 19 12:18:40 2011 -0500 Merge remote-tracking branch 'asn/bug4559' doc/protocol-spec.txt | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-)