commit a56cfdaba20683562e5793d6bded58a591afb04c parent 9ea3d0877a5be2762cfcb4d7c2015e5ec43a2055 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 5 Jun 2017 14:39:06 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d
