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

[nickm at torproject.org]

commit 0cbef8be8811a5ecb3df74b0c433cdb558ed19e7
Merge: 65ef97a 5c08a19
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 13:36:39 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

 Makefile.am                  |    2 +-
 changes/15188                |    3 +++
 changes/bug15033             |    4 ++++
 changes/bug15037             |    4 ++++
 changes/bug15064             |    4 ++++
 changes/bug15083             |   10 ++++++++++
 changes/bug15088             |    4 ++++
 changes/bug15151             |    3 +++
 changes/feature15006         |    4 ++++
 changes/ticket14128          |    5 +++++
 src/common/sandbox.c         |    1 +
 src/or/buffers.c             |   11 +++++++++--
 src/or/connection_edge.c     |    5 +++--
 src/or/control.c             |   15 +++++++++++----
 src/test/testing_common.c    |    7 +++++--
 src/test/zero_length_keys.sh |    4 +++-
 16 files changed, 74 insertions(+), 12 deletions(-)