Merge branch 'master' into develop
Provide an Advanced Options page for easier bridge selection

The options page allows the user to select a specific pluggable
transport type and if they require IPv6 addresses.
All pages inheriting from the base template will provide navigation
buttons.
Improve WebResourceBridges' docstring
Merge branch 'testing/tpo-sysrqb/bug9127' into develop
Add sysrqb to travis email notifications.
Remove Python2.6 testing from .travis.yml.

[ci skip]
Fix UnicodeDecodeErrors from unittests for bridgedb.persistent.
Prefer to use information from NS rather than descriptor
We need to compute the hash digest of the documents during (re)loading
We need the ORPort to be an int, convert it from the get-go
We need to remember the digests of the documents the bridge published
Update the Bridge class docstring
Only add bridges for which their documents were verified by the BA
We should be consistant and use lowercase
Add some unit tests for Bridges module
Update Bridge.__init__() docstring for ip
Fix another UnicodeDecodeError in bridgedb.persistent log call.

 * CHANGE patch for the same error in previous commit to use
   twisted.python.reflect.safe_repr for better clarity.
 * See https://travis-ci.org/isislovecruft/bridgedb/builds/18503773#L1483
Merge branch 'hotfix/ude-persistent' into testing/tpo-sysrqb/bug9264_rebased_1
Revert "We should be consistant and use lowercase"

This reverts commit b502658ff210630328e56c142368f4b44357a205.

Signed-off-by: Isis Lovecruft <isis@torproject.org>
Merge branch 'hotfix/ude-persistent' into develop