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

[nickm at torproject.org]

commit b387dd364f44ff79aff7c4c71a3bff9dd21b1623
Merge: 836d628fc ced2dd5f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 27 08:23:37 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug20247     | 4 ++++
 src/common/sandbox.c | 8 ++++++++
 2 files changed, 12 insertions(+)