commit c138c9a2be868c4d8bad4e6ae5637205f1bdcf0f Merge: 9932544 fbae15a Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jul 17 13:55:04 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19660 | 8 ++++++++ changes/bug19682 | 3 +++ src/common/sandbox.c | 30 +++++++++++++++--------------- src/test/test_util_format.c | 8 ++++---- 4 files changed, 30 insertions(+), 19 deletions(-)