commit 4858cda2df2222c61bb32269aea4f6978d6458fb Merge: dfc0614 c1e4aff Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)