commit f2cf4ab55825b1e6584f85ed54dff58e9c11c1b3 Merge: 6a3234a 81702d1 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 14 12:42:29 2013 -0400 Merge branch 'more-specs-squashed' dir-spec.txt | 65 ++++- proposals/117-ipv6-exits.txt | 2 +- proposals/200-new-create-and-extend-cells.txt | 3 +- proposals/208-ipv6-exits-redux.txt | 2 +- proposals/214-longer-circids.txt | 3 +- proposals/216-ntor-handshake.txt | 3 +- tor-spec.txt | 398 ++++++++++++++++++++----- 7 files changed, 394 insertions(+), 82 deletions(-)