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

[nickm at torproject.org]

commit 5c00b2d335a4c6aa0b01dc51069a2010667ae545
Merge: 273e77c 94e5674
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 11 10:35:46 2012 -0400

    Merge remote-tracking branch 'mikeperry/consensus-bootstrap'

 .../xxx-faster-headless-consensus-bootstrap.txt    |  112 ++++++++++++++++++++
 1 files changed, 112 insertions(+), 0 deletions(-)