[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/bootstrap-exponential-backoff-v2'

[nickm at torproject.org]

commit 3bac19d0b31b54156ff42cda68dfa093e8d9552e
Merge: bc6855e 13c75f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 11:55:25 2015 -0400

    Merge remote-tracking branch 'teor/bootstrap-exponential-backoff-v2'

 .../210-faster-headless-consensus-bootstrap.txt    |  231 +++++++++++++++-----
 1 file changed, 176 insertions(+), 55 deletions(-)