aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2019-04-10test: Also avoid reading the system default torrc in integration teststeor
Part of 29702.
2019-04-10Use empty torrc file when launching tor in test_rebind.pyrl1987
2019-04-04Merge branch 'bug30021_029' into bug30021_035Nick Mathewson
2019-04-04Do not cache bogus results from classifying client ciphersNick Mathewson
When classifying a client's selection of TLS ciphers, if the client ciphers are not yet available, do not cache the result. Previously, we had cached the unavailability of the cipher list and never looked again, which in turn led us to assume that the client only supported the ancient V1 link protocol. This, in turn, was causing Stem integration tests to stall in some cases. Fixes bug 30021; bugfix on 0.2.4.8-alpha.
2019-04-03Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-04-03Merge branch 'maint-0.2.9' into maint-0.3.4Nick Mathewson
2019-04-03Update geoip and geoip6 to the April 2 2019 database.Karsten Loesing
2019-03-27Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4teor
2019-03-22test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9teor
We need a recent test-network.sh to use new chutney features in CI. Fixes bug 29703; bugfix on 0.2.9.1-alpha.
2019-03-21test/dir: add an extra argument to dirserv_read_measured_bandwidths()teor
Part of 29806.
2019-03-21Merge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_mergedteor
Copy and paste the vote=0 code from the old src/or/dirserv.c to the new src/feature/dirauth/bwauth.c.
2019-03-21bwauth: Ignore bandwidth file lines with "vote=0"juga0
so that the relays that would be "excluded" from the bandwidth file because of something failed can be included to diagnose what failed, without still including these relays in the bandwidth authorities vote. Closes #29806.
2019-03-20Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-03-20Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5teor
2019-03-20Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9teor
2019-03-19Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5teor
2019-03-18test/sr: update sr_state_free() to sr_state_free_all() in a commentteor
2019-03-18Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_mergeteor
2019-03-18test/sr: Clear SRVs after init, and before setupteor
Already merged to 0.4.0 and later in tor-github/pr/776. Backported to 0.2.9 and later with minor comment changes. Part of 29706.
2019-03-15Stop logging a BUG() warning when tor is waiting for exit descriptorsteor
Fixes bug 28656; bugfix on 0.3.5.1-alpha.
2019-03-14Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4teor
2019-03-14Merge branch 'bug28096-029-squashed' into bug28096-034-squashedteor
Merge the new code, and preserve the #else macro comment from 0.3.4.
2019-03-14Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034teor
Replace == with OP_EQ in test macros.
2019-03-14Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9teor
2019-03-09test/sr: Free SRVs before replacing them in test_sr_setup_srv()teor
Stop leaking parts of the shared random state in the shared-random unit tests. The previous fix in 29599 was incomplete. Fixes bug 29706; bugfix on 0.2.9.1-alpha.
2019-03-08Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixesteor
2019-03-06Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-03-06Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-03-06Merge branch 'maint-0.2.9' into maint-0.3.3maint-0.3.3Nick Mathewson
2019-03-06Update geoip and geoip6 to the March 4 2019 database.Karsten Loesing
2019-03-01Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9teor
2019-03-01Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9teor
2019-03-01Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9teor
2019-03-01Bug 25733: Avoid assert failure if all circuits time out.Mike Perry
Prior to #23100, we were not counting HS circuit build times in our calculation of the timeout. This could lead to a condition where our timeout was set too low, based on non HS circuit build times, and then we would abandon all HS circuits, storing no valid timeouts in the histogram. This commit avoids the assert.
2019-02-28Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-02-28Merge branch 'maint-0.3.3' into maint-0.3.4teor
2019-02-28Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-02-28Merge branch 'maint-0.3.3' into maint-0.3.4teor
2019-02-28Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-02-27test/shared-random: use sr_state_free_all() rather than sr_state_free()teor
sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3. Part of 29599.
2019-02-27Merge branch 'bug29599_029' into bug29599_033teor
2019-02-27test/shared-random: Stop leaking shared random state in the unit teststeor
Stop leaking parts of the shared random state in the shared-random unit tests. Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-02-27Merge branch 'maint-0.3.3' into maint-0.3.4teor