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

[nickm at torproject.org]

commit 9d366493e752d23ae39256391a27a3bffc299adc
Merge: 5fb49e5 ee08f22
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 21 10:58:43 2016 -0400

    Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug14821        | 2 +-
 changes/bug17906        | 4 ++--
 changes/bug17923        | 2 +-
 changes/bug18050        | 6 +++---
 changes/bug18089        | 6 ++----
 changes/bug18162        | 2 +-
 changes/geoip-march2016 | 2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)