[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm@xxxxxxxxxxxxxx]

commit 3121a6d0c8c8c3f7c01f09120dbe9c4f5a8adfdb
Merge: 107b347 3511549
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 23 19:01:29 2013 -0500

    Merge remote-tracking branch 'origin/maint-0.2.4'

 changes/bug10470 |    4 ++++
 doc/tor.1.txt    |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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