commit e8386cce1ce41b667095cd9590567204d2ab0ba0 Merge: 0030765 a68e532 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 2 14:29:37 2015 -0400

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

changes/bug16244 | 7 +++++++ src/common/sandbox.c | 2 ++ src/or/main.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-)