commit a2517fa77c066e34d58fd50f930529b84e30946e Merge: ba91272 f6b1dc2 Author: Nick Mathewson <[email protected]> Date: Fri Oct 28 09:53:23 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug4331 | 4 ++++
src/or/hibernate.c | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
