[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit 1934bf75ef753e437aa60fe466312017840dd737
Merge: 800dff1 293aca9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 11:02:15 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/bug20534   |  6 ++++--
 changes/bug20593   |  6 ++++++
 src/or/config.c    |  4 ++--
 src/or/directory.c | 28 ++++++++++++++++++----------
 4 files changed, 30 insertions(+), 14 deletions(-)