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

[nickm at torproject.org]

commit 57155d38a3c71e352c083b0e0c3a2326c3181c8d
Merge: ce940c8c0 3808e3015
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 23:12:03 2018 -0400

    Merge branch 'maint-0.3.4'

 src/or/routerlist.c | 1 +
 1 file changed, 1 insertion(+)