[tor-commits] [tor/master] Merge branch 'bug17149'

commit 9febbf0451ecd60fb78c1b4e5632d09bf3403fcc Merge: 4b2ae5a e62fe2f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 24 17:19:21 2015 -0400 Merge branch 'bug17149' src/or/policies.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)