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

[nickm at torproject.org]

commit 20f8fead9c27c0de7a5913f53294e960b029749b
Merge: 0b8de7b3c 6e8e005b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 12:54:31 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(-)