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

[nickm at torproject.org]

commit 64af15d3737921b025a3902acb1dc6b674eb966c
Merge: 9f615fa42 d5dd500e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 18 16:39:25 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/bug26787 | 3 +++
 1 file changed, 3 insertions(+)