commit 72c2292efc916a9da007108d8d019765238bb225 Merge: 698e4a478 bbc9ff160 Author: Nick Mathewson <[email protected]> Date: Wed Jan 3 08:59:59 2018 -0500
Merge branch 'maint-0.3.0' into release-0.3.0
changes/bug24633 | 5 +++++
src/ext/timeouts/timeout-bitops.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
