commit 74bbaa04f761acd3de775dde0c611e4cb8721b26
Merge: 64ef8a5 f79412d
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date: Thu Jan 24 08:48:50 2019 +0000
Merge remote-tracking branch 'boklm/bug_27531_v2'
projects/fteproxy/build | 2 ++
projects/fteproxy/config | 2 ++
projects/fteproxy/fteproxy.wrapper | 10 ++++++++++
projects/libfte/build | 4 ++--
.../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +-
5 files changed, 17 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits