[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit c5ffcbb43f3e444a3e7f7f22057a5fee8958e569
Merge: cd3fc2aa4 beb321d8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 23 09:23:31 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug24969     | 3 +++
 src/common/sandbox.c | 3 +++
 2 files changed, 6 insertions(+)