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

[nickm@xxxxxxxxxxxxxx]

commit be33c3f6006c4cb06e21483c0c0460502ac2c366
Merge: d92d3f3 0a3dfd0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 4 12:49:13 2012 -0400

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

 changes/bug7037  |    6 ++++++
 src/or/command.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

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