torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
29,545 Commits 53 Branches 631 Tags
3a2b5a5bcbb35cdedfb63a00391bbf15df69cd9b
Commit Graph

29545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neel Chauhan 3a2b5a5bcb Fix typo in control_event_hs_descriptor_content() 2018-08-08 00:12:00 -04:00
Nick Mathewson 837f11a532 Merge branch 'maint-0.3.4' 
"ours" merge to avoid version bump.
 2018-08-07 20:15:50 -04:00
Nick Mathewson de129e69ba Update version to 0.3.4.6-rc-dev 2018-08-07 20:15:34 -04:00
Nick Mathewson f537202196 Forward-port the 0.3.4.6-rc changelog 2018-08-07 20:09:35 -04:00
Nick Mathewson 8410d3b0ad These changes files are also merged in 0.3.4.6-rc: remove them. 2018-08-07 08:10:26 -04:00
Nick Mathewson 5e86a28683 Merge branch 'maint-0.3.4' 2018-08-07 08:05:56 -04:00
Nick Mathewson 882b2ad0aa Merge branch 'bug27003_034_v2' into maint-0.3.4 2018-08-07 08:05:51 -04:00
Nick Mathewson abf88af488 Merge branch 'maint-0.3.4' 2018-08-06 10:39:59 -04:00
Nick Mathewson a54e94878a Rename SEC identifier to BW_SEC in test_bwmgt.h 
Apparently Solaris 10 defines SEC somewhere in its headers, causing
a compilation problem.

Fixes bug 26994; bugfix on 0.3.4.1-alpha.
 2018-08-06 10:39:14 -04:00
Nick Mathewson 2584604664 Remove changes files for items already merged into 0.3.4.6-rc 2018-08-06 08:35:41 -04:00
Nick Mathewson c165cb7f57 Merge branch 'maint-0.3.4' 
"ours" to avoid version bump.
 2018-08-06 08:29:44 -04:00
Nick Mathewson a8bab72c37 Bump to 0.3.4.6-rc 2018-08-06 08:28:56 -04:00
Nick Mathewson f90c053377 Update AC_WARN->AC_MSG_WARN. #23878. 2018-08-04 06:53:21 -04:00
Nick Mathewson 5597ddc360 Mark openbsd-malloc as deprecated 2018-08-03 07:38:47 -04:00
Nick Mathewson bb1f294232 Merge branch 'with_malloc_squashed' 2018-08-03 07:35:23 -04:00
Nick Mathewson abde9fb426 Add a --with-malloc option. 
Based on a patch from Hello71 on ticket 20424.

This patch additionally fixes openbsd-malloc support, switches
our tcmalloc support to use pkgconfig, and tells the compiler to
omit system malloc implementations as appropriate.

squash! Add a --with-malloc option.

Edit changelog file to fix a typo and credit Alex Xu in preferred format.
 2018-08-03 07:34:40 -04:00
Nick Mathewson be8e56c231 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-03 07:33:45 -04:00
Nick Mathewson ae157b79e7 Merge branch 'maint-0.3.4' 2018-08-03 07:33:45 -04:00
Nick Mathewson 2a6c1585b0 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-08-03 07:33:45 -04:00
Nick Mathewson 4856a6e6c4 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-03 07:33:45 -04:00
Nick Mathewson 42c6ebda16 Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9 2018-08-03 07:33:39 -04:00
Nick Mathewson 622a057e7e Merge remote-tracking branch 'public/string_coverage' 2018-08-03 07:03:29 -04:00
Nick Mathewson 176999fd95 When enabling periodic events, schedule but don't run them immediately. 
When we fixed 25939 in f7633c1fca, we
introduced a call to rescan_periodic_events() from inside the onion
service logic. But this meant that we could rescan the event list --
thereby running event callbacks! -- from inside the hidden service code.
This could cause us to run some of our event callbacks from an
inconsistent state, if we were in the middle of changing options.

A related bug (#25761) prevented us from rescanning our periodic
events as appropriate, but when we fixed THAT one, this bug reared
its ugly head.

The fix here is that "enabling" an event should cause us to run it
from the event loop, but not immediately from the point where we
enable it.

Fixes bug 27003; bugfix on 0.3.4.1-alpha.
 2018-08-02 10:14:56 -04:00
Nick Mathewson 861d690018 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-01 14:37:07 -04:00
Nick Mathewson af97879446 Merge branch 'maint-0.3.4' 2018-08-01 14:37:07 -04:00
Nick Mathewson eb604f5faa Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873. 2018-08-01 14:37:03 -04:00
Nick Mathewson 7e4ac0283e Merge remote-tracking branch 'teor/bug26986' 2018-07-31 08:50:38 -04:00
Nick Mathewson 01c73711f1 Merge branch 'maint-0.3.4' 2018-07-31 08:30:58 -04:00
Nick Mathewson bcce3e7e0b Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-31 08:30:01 -04:00
Nick Mathewson 373b23a9ee Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3 2018-07-31 08:29:54 -04:00
Nick Mathewson d66cfadbd3 Merge remote-tracking branch 'teor/bug26979' 2018-07-31 08:26:15 -04:00
Nick Mathewson de4d7c3837 Merge branch 'ticket26447' 2018-07-31 08:21:10 -04:00
Roger Dingledine fe9f585143 fix wrong word in comment 2018-07-30 22:35:33 -04:00
teor c3fca338a2 Appveyor CI: always use HEAD for the short commit 
Part of 26979.
 2018-07-31 12:14:40 +10:00
teor fcc8480093 Appveyor CI: Changes file for 26979 
Closes 26979.
 2018-07-31 11:58:04 +10:00
teor c6973aeccb Appveyor CI: sort environmental variables 
To avoid future duplicates.
 2018-07-31 11:54:02 +10:00
teor 02a45b3ea4 Appveyor CI: fix some typos 2018-07-31 11:49:11 +10:00
teor 019c31bbf8 Appveyor CI: Generate correct tag names 
Part of 26979.
 2018-07-31 11:47:33 +10:00
teor 3d3e62d147 Appveyor CI: Switch to one URL per line 
Part of 26979.
 2018-07-31 11:37:11 +10:00
teor 9118430b14 Use Windows-compatible format strings in tor-print-ed-signing-cert.c 
Fixes bug 26986; bugfix on master.
 2018-07-31 11:21:28 +10:00
teor e26794ace9 Add TOR_PRIdSZ to torint.h 2018-07-31 11:21:28 +10:00
teor 9b41eb2bc3 Appveyor CI: Generate correct branches and URLs for pull requests 
Part of 26979.
 2018-07-31 11:13:20 +10:00
teor 861db8c4ae Appveyor CI: Make short commits 10 hexdigits long 
That's what git does for tor.

Part of 26979.
 2018-07-31 11:13:17 +10:00
teor fc9f8c28fb Appveyor CI: Fix GitHub provider detection 
Part of 26979.
 2018-07-31 11:13:10 +10:00
Nick Mathewson acb54dee7b Remove a now-obsolete comment about deadcode_dummy__ 2018-07-30 09:09:10 -04:00
Nick Mathewson 70b16bc679 Merge branch 'ticket26890' 2018-07-30 09:08:39 -04:00
Nick Mathewson aeffbe5101 Run check-includes.py script with detected python path. 2018-07-30 09:07:19 -04:00
Nick Mathewson 21babc8d3f Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-30 09:01:59 -04:00
Nick Mathewson ba1bb90a72 Merge branch 'maint-0.3.4' 2018-07-30 09:01:59 -04:00
Nick Mathewson 3a6bd21440 Merge remote-tracking branch 'teor/bug26627_033_merged_master' 2018-07-30 09:01:55 -04:00