commit 7c68b2f1a500cffbd51aaf534669e1c863de5ec5 Merge: 1d48712c2 2b94b0ea7 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Aug 1 11:23:00 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug22245 | 5 +++++
src/or/hibernate.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
