commit bb79373fe883b931e78730b7bef2de5e69414cac Merge: bbc049a b00a621 Author: Nick Mathewson <[email protected]> Date: Wed Apr 17 10:50:58 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug7143 | 4 ++++
src/or/include.am | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
