commit 54e2a3315a94b86454b687600bb02ada96b3699c Merge: 22414c050 a5bbe3f1d Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 20:04:17 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

.travis.yml | 253 ++++++++++++++++++++++++++----------------- changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_util/include.am | 1 - src/test/test_rust.sh | 17 ++- 13 files changed, 194 insertions(+), 109 deletions(-)