[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit a3c1d78c29a6827f623c83ca8f45798019206bc9
Merge: 6317aa2cc 3cc382b93
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 28 08:11:46 2018 -0400

    Merge branch 'maint-0.3.3'

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