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

[nickm at torproject.org]

commit 30f54085e368ae6f044ccb60f288dfd9503a70e5
Merge: 9d36649 920e3d6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 21 11:00:58 2016 -0400

    Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug14821 | 2 +-
 changes/bug17906 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)