commit 188ac6eafb2febc3feadad27f10ddbdf80bb7ca3 Merge: a5a241a 8ce86c0 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 17 10:43:49 2014 -0500

Merge remote-tracking branch 'karsten/reorder-dirspec'

dir-spec.txt | 723 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 385 insertions(+), 338 deletions(-)