[tor-commits] [tor/master] Merge branch 'trove-2018-005_032' into maint-0.3.3

[nickm at torproject.org]

commit 80d673ccea4d6f784052dc5bc55cec04647556e7
Merge: a5d4ce2b3 7483aef89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 14:13:23 2018 -0400

    Merge branch 'trove-2018-005_032' into maint-0.3.3

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