[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11605_024'

[nickm@xxxxxxxxxxxxxx]

commit 545e2119f2e96dedef2efd254632f0204f70ab76
Merge: acc7623 f0a57bd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 29 14:33:39 2014 -0400

    Merge remote-tracking branch 'public/bug11605_024'

 changes/bug11605  |    2 ++
 src/common/util.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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