commit e6d2059751da008a1fb00b42039eb4cbc638e638 Merge: 5636b16 8de1b94 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 13 16:51:09 2017 -0400

Merge remote-tracking branch 'isis/bug22830_0.3.1' into maint-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(-)