Merge from torproject.org: