Merge branch 'master' into develop
Fix a typo in doc/DESCRIPTORS.md.
Add example extrainfo `transport` line for scramblesuit.

Philipp Winter's scramblesuit paper has a section on creating easily
handwritable shared secrets. [0]

To my memory, this excludes using the character `O` (capital o) and the
integer `1`, because they are easily confused for the integer '0' and
the character 'l', respectively. However, Philipp mentioned on IRC that
scramblesuit `password=` fields in the `transport` line are actually
just the set of base32 characters. [1]

 * ADD a line to doc/DESCRIPTORS.md which shows an example
   scramblesuit-enabled bridge which uses a shared secret passed through
   BridgeDB. See #9013.

[0]: http://arxiv.org/abs/1305.3199
[1]: https://tools.ietf.org/html/rfc4648
Sync bridgedb.conf with bridgedb-admin.git (no settings changed).
Comment out print()s and sys.stdout.write()s in setup.py.
Update most translations.

There was a newly-added escaped double quote without a corresponding,
escaped pair, followed by a newline, i.e.: `\"\n` in the Thai
translation which didn't seem to mess up the template parser nor the
browsers I tested it in, but it did add an unnecessary double quote on
the page so I removed it.
Add docstrings to HTTPServer.WebRoot class and render_GET() method.
Fix Sphinx directives in HTTPServer.usingRTLLang().
Fix unhandled traceback in HTTPServer.WebRoot.render_GET() for #6127.
Merge branch 'fix/6127-render_GET-traceback' into develop
Add COLLECT_TIMESTAMPS option for configuring addOrUpdateBridgeHistory().

 * ADD a new option, `COLLECT_TIMESTAMPS` to the config file to configure
   whether or not to run the timestamp collection code, including
   `Stability.addOrUpdateBridgeHistory()`, in `Main.load()`.
 * FIXES #10724
Merge branch 'feature/10724-collect-timestamps-option' into develop
Don't safelog randomly generated IPs.

 * REMOVE calls to `Util.safelog` which masked the IP addresses which
   are randomly generated in
   `HTTPServer.CaptchaProtectedResource.render_POST()`. These random IPs
   are sent to the ReCaptcha server in order to not reveal the client's
   real IP, and they are no more revealing/identifying of a particular
   client than the `twisted.web.http.Request.args` which are logged.
Make log message for strange X-Forward-For headers clearer.
Split a long string of chained method calls into separate calls.

 * CHANGE a line in HTTPServer.CaptchaProtectedResource which chained
   several method calls together inside a return statement, into a
   separate lines for each call.
Fix a misnamed logger call in HTTPServer; change severity level.
Catch error case in HTTPServer where ReCaptcha image is None.
Add Sphinx docstring to CaptchaProtectedResource.render_POST().
Preserve HTTP POST args across redirects.

 * FIXES #10737, an issue where if a CAPTCHA was entered incorrectly, the
   client would be redirected back to /bridges.html without the original HTTP
   POST arguments (which specify the requested pluggable transports, IP
   version, etc.).
Fix indentation level in method docstring.