commit c3e14a3236c2c7577f0b9425418684fc95f44862 Merge: 3dc5cce74 bfab7b9d3 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 24 09:02:06 2018 -0400

Merge branch 'maint-0.3.5'

src/rust/tor_log/tor_log.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)