summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-05Merge branch 'maint-0.3.3' into maint-0.3.4Roger Dingledine
2019-02-01Update Cargo.lock with new comment; suppress 29244.Nick Mathewson
2019-01-23Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-23Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
"ours" merge to avoid dropping non-broken changes files after removal of merged 0.2.9 changes files.
2019-01-23maint-0.2.9: remove changes files that are merged in 0.2.9 releasesNick Mathewson
Many of these files cause check-changes to fail, which will be a long-term problem as we continue to support 0.2.9.
2019-01-18Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-18Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-10rend: stop warning when clients send multiple rend establish cellsteor
Stop logging "Tried to establish rendezvous on non-OR circuit..." as a warning. Instead, log it as a protocol warning, because there is nothing that relay operators can do to fix it. Fixes bug 29029; bugfix on 0.2.5.7-rc.
2019-01-07Update to 0.3.4.10-devNick Mathewson
2019-01-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
"Ours" to avoid version bump.
2019-01-07Update to 0.3.3.3.11-devNick Mathewson
2019-01-07Bump to 0.3.4.10Nick Mathewson
2019-01-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
"ours" merge to avoid version bump.
2019-01-07Bump to 0.3.3.11Nick Mathewson
2019-01-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-07Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-07Update geoip and geoip6 to the January 3 2019 database.Karsten Loesing
2019-01-04Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-04Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-04Merge branch 'bug21394_029_redux' into maint-0.2.9Nick Mathewson
2019-01-04Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-04Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3Nick Mathewson
2019-01-04Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4Nick Mathewson
2019-01-03Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-03Merge branch 'ticket28973_033_squashed' into maint-0.3.3Nick Mathewson
2019-01-03Detect openssl bug 7712 and work around it.Nick Mathewson
In theory it would be better to detect this bug in advance, but this approach is much simpler, and therefore safer to backport. This closes tor issue 28973.
2018-12-21mainloop: Reactivate the linked connection event with a non empty listDavid Goulet
Linked connections aren't woken up by libevent due to I/O but rather artificially so we can, by chunks, empty the spooled object(s). Commit 5719dfb48f87a54aeb5982ff03345303bc058ebb (in 0.3.4.1-alpha) made it that the schedule_active_linked_connections_event would be only called once at startup but this is wrong because then we would never go through again the active linked connections. Fortunately, everytime a new linked connection is created, the event is activated and thus we would go through the active list again. On a busy relay, this issue is mitigated by that but on a slower relays or bridge, a connection could get stuck for a while until a new directory information request would show up. Fixes #28717, #28912
2018-12-11Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-12-11Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-12-11Note ticket number in changes file for 24803Nick Mathewson
2018-12-11Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-12-11Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-12-10Fallbacks: Update the hard-coded fallback list in December 2018teor
Merge Phoul's two lists into teor's list. Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in January 2018 (of which ~115 were still functional), with a list of 157 fallbacks (92 new, 65 existing, 85 removed) generated in December 2018. Closes ticket 24803.
2018-12-07Fallbacks: Update the hard-coded fallback list in December 2018teor
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in January 2018 (of which ~115 were still functional), with a list of 148 fallbacks (89 new, 59 existing, 91 removed) generated in December 2018. Closes ticket 24803.
2018-12-06Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-12-06Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-12-05Update geoip and geoip6 to the December 5 2018 database.Karsten Loesing
2018-12-01Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-27Explicitly specify path to OpenSSL for Appveyor.Alexander Færøy
This patch explicitly specifies the path to our OpenSSL dependency and disables the installation of an external OpenSSL version and instead uses the OpenSSL version available from the MinGW environments. See: https://bugs.torproject.org/28574
2018-11-26hs-v3: Do not close RP circuits when deleting an ephemeral serviceDavid Goulet
Bug reported on tor-dev@ and here is the detail explanation of the issue: https://lists.torproject.org/pipermail/tor-dev/2018-November/013558.html Fixes bug #28619 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-22Test: Fix memory leaks and missing unmocks in entry guard teststeor
test_entry_guard_outdated_dirserver_exclusion leaks memory, and is missing some unmocks. Fixes 28554; bugfix on 0.3.0.1-alpha.
2018-11-20Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4Nick Mathewson
2018-11-15Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'bug25573-034-typefix' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-11-15Merge branch 'bug26913_033' into maint-0.3.3Nick Mathewson
2018-11-15Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9Nick Mathewson
Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f.
2018-11-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion