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

[nickm at torproject.org]

commit 8e633d06435e4b78f0ec45ba3b5d81d25aae1d3f
Merge: 3a6cbde b167e82
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 6 10:17:16 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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