commit 9c1d8cdd8d22f4004a0dec144527d73656bace2d Merge: 3252550 b167e82 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 6 10:17:22 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug19608 | 6 ++++++ src/or/policies.c | 36 +++++++++++++++--------------------- 2 files changed, 21 insertions(+), 21 deletions(-)