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

[nickm at torproject.org]

commit b2871cef91fbabd1dccdd8a424d5921948ab9d22
Merge: cbe36a739 6e5e4f92a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 2 10:10:28 2018 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24736  | 6 ++++++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)