[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)