commit 715185477d135d87f8ebf6fb12804cb2db5856bb Merge: f6420bc 78dfa76 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)