commit e31487b4edde5e2e45491f5c32c421acd133ada6 Merge: 08cd7a1bf 3cc382b93 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 28 08:11:46 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug25664 | 3 +++ configure.ac | 2 +- doc/HACKING/GettingStartedRust.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)