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

[nickm at torproject.org]

commit 1962a4ea9c79846c5172e8791db4410998a267f9
Merge: 9d64304be 573b6e4f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 22 09:37:31 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 src/or/connection_edge.c | 1 -
 1 file changed, 1 deletion(-)