[tor-commits] [torspec/master] Merge remote-tracking branch 'public/finish_prop157'

[nickm at torproject.org]

commit edfba62f3bdfd9659a38e899e11dedd604d0718d
Merge: 74c3e40 047f6dd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 18 13:27:48 2013 -0500

    Merge remote-tracking branch 'public/finish_prop157'

 dir-spec.txt                             |    9 ++-------
 proposals/157-specific-cert-download.txt |    2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)