commit d0f969a43708436e0e4c7181f0426b497649bc42 Merge: 6f22a0c15 8ea98c0f4 Author: Roger Dingledine <arma at torproject.org> Date: Tue Feb 5 08:10:02 2019 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug29244 | 4 ++++ src/rust/Cargo.lock | 2 ++ 2 files changed, 6 insertions(+)