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

[nickm@xxxxxxxxxxxxxx]

commit 068d092749508bae84e6d5fce605d2f40c1bdb80
Merge: 1aa0ae2cc 9f93bcd16
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Mar 26 10:29:29 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/feature25313 |  4 ++++
 src/common/sandbox.c | 23 ++---------------------
 2 files changed, 6 insertions(+), 21 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits