commit 80466eb21531c2d47e0cb6d7163492c16cf608ef
Merge: 39cc300 4cbbb92
Author: Roger Dingledine <[email protected]>
Date: Fri Apr 8 17:01:24 2011 -0400
Merge branch 'maint-0.2.2' into release-0.2.2
changes/osx_forgotten_compilefix | 4 ++++
changes/win_tmp_dir | 4 ++++
src/common/log.c | 11 ++++++++++-
src/or/rephist.c | 19 ++++++++++++++++---
src/test/test.c | 14 ++++++++++----
5 files changed, 44 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
