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

[nickm at torproject.org]

commit 1983426073effeb2b35e0f11f4c02e2526c804a1
Merge: b915b6cd2 b2625b09f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 11 10:00:22 2018 -0500

    Merge branch 'maint-0.3.5'

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