commit 24aaeef6649434cb27418d5a9ad1cbc3a37ced2c
Merge: 54b23c7 ad4ff7a
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Apr 7 10:46:45 2016 -0400
Merge branch 'maint-0.2.7' into release-0.2.7
changes/bug15221 | 4 +
changes/bug16248 | 8 +
changes/bug18570 | 7 +
changes/geoip-april2016 | 4 +
src/common/sandbox.c | 9 +
src/config/geoip | 3255 +++++++++++++++++++++++++++++++++++------------
src/config/geoip6 | 2549 +++++++++++++++++++++++++++++--------
src/or/channel.c | 38 +-
src/or/channeltls.c | 11 +
src/or/connection_or.c | 35 +
src/or/connection_or.h | 1 +
src/or/main.c | 55 +-
src/test/test_channel.c | 121 +-
13 files changed, 4731 insertions(+), 1366 deletions(-)