commit e1a25f0c3602e007872277ef9ab437cc97cfd47b Merge: 87576e8 09951be Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 29 13:02:35 2014 -0400

Merge branch 'bug13295_v2_025' into maint-0.2.5

changes/13295 | 5 +++++ src/common/sandbox.c | 21 +++++++++++++++++++++ src/common/sandbox.h | 2 ++ src/tools/tor-resolve.c | 2 ++ 4 files changed, 30 insertions(+)