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

[nickm at torproject.org]

commit c8bcbf5ac2d61d1befdf2333bffe9d6a09a800ea
Merge: 78cb55e 0815f96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 7 11:14:46 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20875   | 4 ++++
 src/or/directory.c | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)