[tor-commits] [tor/release-0.2.9] Merge branch '20499_part1_029_squashed', remote-tracking branches 'teor/bug20591_029' and 'teor/bug20533_029' into maint-0.2.9

[nickm at torproject.org]

commit d82ffb77f3345497480a074d32f8350c481902df
Merge: ce8a1e2 858867a 1bb28ce e819d42
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:20:13 2016 -0500

    Merge branch '20499_part1_029_squashed', remote-tracking branches 'teor/bug20591_029' and 'teor/bug20533_029' into maint-0.2.9

 changes/bug20533       |  7 +++++++
 changes/bug20534       |  6 ++++++
 changes/bug20536       |  6 ++++++
 changes/bug20587       |  6 ++++++
 changes/bug20591       |  3 +++
 src/or/directory.c     | 11 +++++++----
 src/or/directory.h     | 12 +++++++++---
 src/or/networkstatus.c | 19 ++++++++++++++-----
 8 files changed, 58 insertions(+), 12 deletions(-)