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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.9' into maint-0.3.0

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