Nick Mathewson c380562aed Merge branch 'bug26116_029' into maint-0.2.9 %!s(int64=6) %!d(string=hai) anos
..
common 881f7157f6 Return -1 from our PEM password callback %!s(int64=6) %!d(string=hai) anos
config 033e4723f3 Update geoip and geoip6 to the May 1 2018 database. %!s(int64=6) %!d(string=hai) anos
ext accd0ea65b Fix the clz32 and clz64 settings on MSVC. %!s(int64=6) %!d(string=hai) anos
or 5eb2d58880 Add a missing return after marking a stream for bad connected cell %!s(int64=6) %!d(string=hai) anos
test aeb4be1d5a Add a unit test for PEM-encrypted documents. %!s(int64=6) %!d(string=hai) anos
tools c4920a60c6 Do not truncate too long hostnames %!s(int64=7) %!d(string=hai) anos
trunnel 25513ae174 Re-run trunnel. %!s(int64=7) %!d(string=hai) anos
win32 9eb6f9d3c8 Bump version to 0.2.9.15-dev %!s(int64=6) %!d(string=hai) anos
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. %!s(int64=9) %!d(string=hai) anos