No longer writing control ports to file if updating reversible options fail. Fixes #5605.
DROPGUARDS controller command

Implements ticket 9934; patch from "ra"
Give a better warning when stack protection breaks linking.

Fix for 9948; patch from Benedikt Gollatz.
Better detection for certain broken cross-compiling situations.

Fixes bug 9869; patch from Benedikt Gollatz.
Make test_cmdline_args.py work with older pythons

I was using the assertIn() function on unit tests, which Python 2.7
introduced.  But we'd like to be able to run our unit tests on Pythons
from older operating systems.
Log the origin address of controller connections

Resolves 9698; patch from "sigpipe".
Merge remote-tracking branch 'Ryman/bug5605'
Tweak 5605 changes file
Merge remote-tracking branch 'public/bug9934_nm'
clarify that DisableNetwork closes connections too
Merge branch 'master' of https://git.torproject.org/tor