commit f23f3630321e4b98db7ef47dfb596eb06ad94abb Merge: 96707e2 513cd25 Author: Isis Lovecruft <isis@torproject.org> Date: Sat Oct 28 00:27:59 2017 +0000 Merge branch 'master' into develop CHANGELOG | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)