[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

[nickm at torproject.org]

commit 1321608786c452ab9f0bf19f37509938f7755117
Merge: d6adb26 e9bf584
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 8 08:45:09 2015 -0500

    Merge branch 'maint-0.2.7'

 changes/bug16056  |    4 ++++
 src/or/policies.c |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)