commit f3267741e45c7944196696c51b81d76201af1e76 Merge: 9af6c48d2 d27745d81 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 18 17:09:03 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26402 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)