sengler/tor-parallel-relay-conn @ e712b5d784db912f7924f090b918888125aa6bcf

Nick Mathewson e712b5d784 Merge branch 'bug19968_029' into maint-0.2.9		9 rokov pred
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	10 rokov pred
bug19869	d288704023 Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR	9 rokov pred
bug19968	becc957839 Actually clamp the number of detected CPUs to 16.	9 rokov pred
bug20401	24b7b922ae Actually free the worker_state_t object when we do an update with it	9 rokov pred
more_module_docs	9a3adb07c4 changes file for module docs	9 rokov pred