commit 8450f6e9a04be27f828f27a916f6560518741ca8 Merge: fb0de57 448bd22 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 9 13:21:20 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/ticket14128 | 5 +++++ 1 file changed, 5 insertions(+)