commit 586a9ea8321d3584f3a17216af865419cf057d81 Merge: 85d279e54 05d62a3b7 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 20:04:17 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

.travis.yml | 213 ++++++++++++++++++++++++++------------------- changes/bug27088 | 5 ++ changes/ticket24629 | 3 + changes/ticket26560 | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + 6 files changed, 140 insertions(+), 90 deletions(-)