[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9

[nickm at torproject.org]

commit 733b2452836dffdf6fbb64c77fd168e24f278d55
Merge: 9248466 3158777
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 1 13:05:33 2016 -0400

    Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9

 changes/bug20472       |  4 ++++
 src/or/circuitbuild.c  | 65 ++++++++++++++++++--------------------------------
 src/or/networkstatus.c |  6 ++---
 src/or/routerlist.c    | 14 ++++++-----
 src/or/routerlist.h    |  4 ++--
 5 files changed, 40 insertions(+), 53 deletions(-)