commit cb35a7c2718eef6411ff49f3bc7b20418bfddcd2 Merge: db67867 733b245 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 1 13:05:45 2016 -0400

Merge branch '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(-)