[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit b63d6984a612aaeaa5f71e213b4f7a89644559b2
Merge: f3267741e e309aa4c8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 19 19:10:28 2018 -0400

    Merge branch 'maint-0.3.4'

 src/or/include.am | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)