[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

[arma at torproject.org]

commit bca25eebfbc9e80665d63bbe02ba5ce21081eab1
Merge: 712a622fc 8ea98c0f4
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Feb 5 08:10:14 2019 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/bug29244    | 4 ++++
 src/rust/Cargo.lock | 2 ++
 2 files changed, 6 insertions(+)