[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

[nickm at torproject.org]

commit 55e1fe874de322a280dd8e2dfb92407360aad14e
Merge: 6a8550f c5c4ea2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 4 12:20:01 2015 +0100

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

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