commit d792d2a14ddb7d2ff62dea8ed7d15416b1254348 Merge: f587691 0df22e8 Author: Nick Mathewson nickm@torproject.org Date: Mon May 8 13:40:26 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

changes/bug21943 | 6 ++++++ src/common/sandbox.c | 1 + 2 files changed, 7 insertions(+)