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

[nickm at torproject.org]

commit ee5337e90497e31c1ef18630c4f089e70bda5269
Merge: 7ff18cc e408aa3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 30 22:03:00 2015 -0500

    Merge branch 'maint-0.2.7'

 changes/bug17722 |    3 +++
 src/or/torcert.c |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)