Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

recent changes #1037

Merged
merged 14 commits into from
Dec 16, 2017
Merged

recent changes #1037

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
44d6d44
Don't meddle with stdlib
AMDmi3 Dec 5, 2017
3cf26a8
Merge pull request #1022 from AMDmi3/patch-1
orignal Dec 5, 2017
c0c0642
temporary disable osx build due to of big waiting time of VM
r4sas Dec 5, 2017
18b6353
fix typo
yangfl Dec 7, 2017
1121d45
Merge pull request #1025 from yangfl/pr
orignal Dec 7, 2017
fc73dab
Use transient destinations by default instead of shared local destina…
majestrate Dec 9, 2017
b3ba0a7
Merge pull request #1027 from majestrate/transient-by-default
orignal Dec 9, 2017
60ef70c
gradle build added
orignal Dec 10, 2017
6632b71
gradle relese build
orignal Dec 10, 2017
511499d
Reorder preprocessor conditions in libi2pd/I2PEndian.h
AMDmi3 Dec 11, 2017
13b17c5
Merge pull request #1030 from AMDmi3/freebsd_kernel
orignal Dec 11, 2017
0f2d215
Don't use deprecated boost::asio::ssl::context ctor
AMDmi3 Dec 11, 2017
6dba0c6
Merge pull request #1031 from AMDmi3/boost-asio-fix
orignal Dec 11, 2017
50e4fb1
close #1032 (#1034)
r4sas Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libi2pd_client/ClientContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ namespace client
int port = section.second.get<int> (I2P_CLIENT_TUNNEL_PORT);
// optional params
bool matchTunnels = section.second.get(I2P_CLIENT_TUNNEL_MATCH_TUNNELS, false);
std::string keys = section.second.get (I2P_CLIENT_TUNNEL_KEYS, "");
std::string keys = section.second.get (I2P_CLIENT_TUNNEL_KEYS, "transient");
std::string address = section.second.get (I2P_CLIENT_TUNNEL_ADDRESS, "127.0.0.1");
int destinationPort = section.second.get (I2P_CLIENT_TUNNEL_DESTINATION_PORT, 0);
i2p::data::SigningKeyType sigType = section.second.get (I2P_CLIENT_TUNNEL_SIGNATURE_TYPE, i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256);
Expand Down