[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit 041947977ec9b0b3efc54e10a9fde8f209e0ddad
Merge: 824b160 5280a70
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 24 10:44:21 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19973      |  6 ++++++
 src/or/circuitbuild.c |  9 +++++++--
 src/or/or.h           |  5 ++++-
 src/or/routerlist.c   | 14 ++++++++------
 src/or/routerlist.h   |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)