commit 144ec3d58cd7358e6563023737a5f91844db93b0 Merge: 124062e 635c5a8 Author: Roger Dingledine <arma@torproject.org> Date: Mon Feb 13 15:23:50 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug20384 | 10 ++++++++++ 1 file changed, 10 insertions(+)