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

[nickm at torproject.org]

commit 2499ea359ab149343e10c38fb87ba903a0e8e049
Merge: b0a8429 0815f96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 7 11:14:56 2016 -0500

    Merge branch 'maint-0.2.9'

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