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

[nickm at torproject.org]

commit 6e8e005b531c9061866bb4f601e4b97814834687
Merge: 074b182ba 240bb1771
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 12:54:26 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(-)