aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-24Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-05-24Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-24Merge branch 'bug26116_029' into maint-0.2.9Nick Mathewson
2018-05-24Add a unit test for PEM-encrypted documents.Nick Mathewson
2018-05-22Add a missing "return -1" when checking for Ed25519 ID loopsNick Mathewson
Fixes bug 26158; bugfix on 0.3.0.1-alpha.
2018-05-16Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-05-16Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-16Merge branch 'bug26072_029' into maint-0.2.9Nick Mathewson
2018-05-16Return -1 from our PEM password callbackNick Mathewson
Apparently, contrary to its documentation, this is how OpenSSL now wants us to report an error. Fixes bug 26116; bugfix on 0.2.5.16.
2018-05-15Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-05-15Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-15Update geoip and geoip6 to the May 1 2018 database.Karsten Loesing
2018-05-14Add a missing return after marking a stream for bad connected cellNick Mathewson
Fixes bug 26072; bugfix on 0.2.4.7-alpha.
2018-05-10Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-05-10Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1Nick Mathewson
2018-05-10Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-05-10Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-10Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9Nick Mathewson
2018-05-10hs-v3: Add an extra white-space when parsing descriptorDavid Goulet
The specification describes the signature token to be right after a newline (\n) then the token "signature" and then a white-space followed by the encoded signature. This commit makes sure that when we parse the signature from the descriptor, we are always looking for that extra white-space at the end of the token. It will allow us also to support future fields that might start with "signature". Fixes #26069 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-10Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-05-10Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-09Having a ControlPort open doesn't mean we are a clientDavid Goulet
The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-09Test read bandwidth measurements with empty filejuga0
2018-05-09Stop logging stack contents when reading a zero-length bandwidth fileteor
When directory authorities read a zero-byte bandwidth file, they log a warning with the contents of an uninitialised buffer. Log a warning about the empty file instead. Fixes bug 26007; bugfix on 0.2.2.1-alpha.
2018-05-03Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-05-03Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-03Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1Nick Mathewson
2018-05-03Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9Nick Mathewson
2018-05-02Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-05-02Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-02Stop logging stack contents when reading a zero-length bandwidth fileteor
When directory authorities read a zero-byte bandwidth file, they log a warning with the contents of an uninitialised buffer. Log a warning about the empty file instead. Fixes bug 26007; bugfix on 0.2.2.1-alpha.
2018-04-26Merge branch 'bug25936-029' into bug25936-031Taylor Yu
2018-04-26Show test-suite.log for distcheck on Travis CITaylor Yu
When Travis CI runs make distcheck, test-suite.log doesn't exist in the expected place. Add a new make target to show this file and use it when DISTCHECK=yes in .travis.yml. Fixes bug 25814; bug not in any released Tor.
2018-04-25Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-04-25Fix a copy-paste error in the fix for #23693.Nick Mathewson
Found by coverity; CID 25912; bug not in any released Tor.
2018-04-24Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-04-24Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-24Merge branch 'travis_distcheck_029' into maint-0.2.9Nick Mathewson
2018-04-24Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-04-24Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1Nick Mathewson
2018-04-23Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-04-23Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-23Merge branch 'bug24969_029_v2' into maint-0.2.9Nick Mathewson
2018-04-23Permit the nanosleep system call in the seccomp2 callboxNick Mathewson
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-22Allow cpuworkers to exist without onion keysNick Mathewson
Now that we allow cpuworkers for dirport-only hosts (to fix 23693), we need to allow dup_onion_keys() to succeed for them. The change to construct_ntor_key_map() is for correctness, but is not strictly necessary.
2018-04-18Add distcheck support to travis configuration.Nick Mathewson
Implements 25814.
2018-04-17Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2018-04-17Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-16Add support for the coveralls.io coverage tool in travis configNick Mathewson
Closes ticket 25818.
2018-04-16Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson