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

[nickm at torproject.org]

commit 3a547076b6ff2a043f7d751426e34b6408754369
Merge: ddd30f9 920e3d6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 21 11:01:47 2016 -0400

    Merge branch 'maint-0.2.7'

 changes/bug14821        | 4 ++--
 changes/bug18162        | 2 +-
 changes/geoip-march2016 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)