commit 85ac832a1474e274ff4a6ad9444cf5e0ab12450e Merge: 67d88a7 70e0291 Author: Nick Mathewson <[email protected]> Date: Thu Apr 7 20:27:39 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/win_tmp_dir | 4 ++++
src/test/test.c | 14 ++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
