[tor-commits] [torspec/master] Merge remote-tracking branch 'mikeperry/tolerate-old-consensus'

[nickm at torproject.org]

commit 65a25edba1d16d2d651bcf02e516171813302d96
Merge: d312aa6 e4a4d50
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 16 21:56:52 2012 -0400

    Merge remote-tracking branch 'mikeperry/tolerate-old-consensus'

 proposals/xxx-using-old-consensus.txt |  108 +++++++++++++++++++++++++++++++++
 1 files changed, 108 insertions(+), 0 deletions(-)