[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug14845_026_01'

[nickm@xxxxxxxxxxxxxx]

commit 43a8457b56ce4cf185822e0f700deab5059b9d47
Merge: 01d988d 6517219
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Apr 23 09:25:00 2015 -0400

    Merge remote-tracking branch 'dgoulet/bug14845_026_01'

 src/or/control.c |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits