commit 7e969a7b2d3f5fa1de3d064783a5134b06e79652 Merge: 4ef6e1d44 8db047b92 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 8 09:02:05 2018 -0500 Merge branch 'maint-0.3.5' ChangeLog | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)