commit b585cf3ca38a947450cafacaef4d85db6c377635 Merge: 95c03b2 eeb9751 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 8 09:44:01 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)