commit db961cbce7e9e83e1043f5cc429add7bffbdf92c Merge: 1750421 60c4428 Author: Philipp Winter phw@nymity.ch Date: Wed Aug 7 12:59:29 2019 -0700

Merge branch 'obfs4-guide-overhaul'

.../bridge/centos-rhel-opensuse/contents.lr | 6 ++-- .../technical-setup/bridge/contents.lr | 6 ++-- .../bridge/debian-ubuntu/contents.lr | 10 +++---- .../technical-setup/bridge/docker/contents.lr | 32 +++++++++++----------- .../technical-setup/bridge/freebsd/contents.lr | 6 ++-- .../bridge/getting-help/contents.lr | 16 +++++++++++ .../technical-setup/bridge/openbsd/contents.lr | 6 ++-- .../bridge/post-install/contents.lr | 4 +-- 8 files changed, 52 insertions(+), 34 deletions(-)