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

[nickm at torproject.org]

commit 74e41155ffc3e295322904b5c85179db538d91f8
Merge: 21dd3ece6 d9fde8760
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 22 12:27:50 2019 -0500

    Merge branch 'maint-0.3.5'

 changes/bug29042 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)