commit 9a518d98620e4d316cdac88811a5c33cc1787060 Merge: 93f2cb4 43fb11f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 8 12:23:35 2012 -0500 Merge remote-tracking branch 'linus/bug5053-bug5055' control-spec.txt | 7 ++++++- dir-spec.txt | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-)