[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.6

[nickm at torproject.org]

commit c5c4ea2db0411ac1e5f3abd6ca8fa4ae322ee906
Merge: 5ad47aa d5b2cbe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 4 12:19:28 2015 +0100

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

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