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

[nickm at torproject.org]

commit 602e328dc33fec8eec976e497e04db810382b8b9
Merge: 2fe3afc 6785f0b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 8 10:42:25 2015 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug16030        |    3 +++
 changes/bug16164        |    4 ++++
 changes/bug16212        |    5 +++++
 changes/bug16244        |    7 +++++++
 changes/bug16247        |    5 +++++
 changes/ticket8243      |    7 +++++++
 configure.ac            |    2 +-
 src/common/sandbox.c    |   12 ++++++++++++
 src/or/connection.c     |    4 ++--
 src/or/dirserv.c        |    6 ++++--
 src/or/main.c           |    2 +-
 src/test/test_channel.c |    2 +-
 12 files changed, 52 insertions(+), 7 deletions(-)