[guacamole-server] 01/01: Merge 1.3.0 changes back to master.

[vnick]

This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit d20b38583466908d253193626ffab4415ca8a70a
Merge: 2fc3a43 b608bb1
Author: Nick Couchman <vn...@apache.org>
AuthorDate: Tue Dec 22 19:05:16 2020 -0500

    Merge 1.3.0 changes back to master.

 src/guacd/log.c              | 2 +-
 src/libguac/user-handshake.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)