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

[nickm at torproject.org]

commit 130a9c0ac8aa13acf7e59872aa628e1864fc828d
Merge: 3c5fe7b 59fa0c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 15 10:19:46 2015 -0400

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

 changes/bug16363     |    4 ++++
 src/common/sandbox.c |    8 ++++++++
 2 files changed, 12 insertions(+)