[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'workqueue_squashed'
commit 3b6d2f9bf407ee560bafaeabb02b3bc88caa680a
Merge: b58dfba 1633d1a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Fri Aug 21 10:37:01 2015 -0400
Merge branch 'workqueue_squashed'
Makefile.am | 3 +-
changes/workqueue_reply_t | 6 ++++
doc/include.am | 6 +---
doc/tor-fw-helper.1.txt | 60 -------------------------------------
scripts/maint/checkSpace.pl | 3 +-
scripts/maint/format_changelog.py | 1 -
src/common/compat.c | 1 +
src/common/container.h | 3 +-
src/common/workqueue.c | 21 ++++++-------
src/common/workqueue.h | 19 ++++++------
src/or/control.c | 1 +
src/or/cpuworker.c | 4 +--
src/or/rendcache.c | 2 +-
src/or/rendclient.c | 9 +++---
src/test/test_util.c | 1 -
src/test/test_workqueue.c | 29 ++++++++++++++++--
16 files changed, 69 insertions(+), 100 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits