commit 291cd50939fdd53fd2d1ee1db4a4859eb2aadae4 Merge: 6c5db03 fd8f21e Author: Nick Mathewson <nickm@torproject.org> Date: Sun Oct 19 15:40:25 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13471 | 5 +++++ 1 file changed, 5 insertions(+)