commit 410ce4cb49016b86a95056c8997d020c0c95d930 Merge: 1a7419c d5b2cbe Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 9 13:09:50 2015 -0400

Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5

changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+)