commit d807c7c8725acb85a6695ab399f99c2509a245c4 Merge: 3368b0c 746bb55 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 15 12:38:43 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14220 | 4 ++++ 1 file changed, 4 insertions(+)