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

[nickm at torproject.org]

commit 0ded72322c87ec836a40b6704ee0919add741a53
Merge: 8230cf7 cf2f36b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 08:21:46 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/20492     | 4 ++++
 src/or/include.am | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)