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

[nickm at torproject.org]

commit 67da2d94119aaf7c843f88ff63302f7ff52218bf
Merge: 025670236 80d673cce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 14:13:28 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 src/or/protover.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)