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

[nickm at torproject.org]

commit 4d52b740f982d4f0078ae13fd4a582d1c4fceabc
Merge: d5c1b7f e6d2059
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 13 16:51:18 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug22830             | 5 +++++
 src/rust/tor_util/include.am | 2 +-
 src/test/test_rust.sh        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)