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

[nickm at torproject.org]

commit 633813e313cc6e889790e2bf9875a842ba1d99b7
Merge: 6506b1ee9 93019b478
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 11 10:00:22 2018 -0500

    Merge branch 'maint-0.3.3' into maint-0.3.4

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