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
26,798 Commits 53 Branches 631 Tags
93dbce4ddd98ca9a4ff2f597b165c87410cabd0e
Commit Graph

26798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 93dbce4ddd Log a better message if a router we're re-adding is expired. 
Addresses ticket 20020.
 2017-11-16 08:35:06 -05:00
Nick Mathewson 8ff60b5288 Merge branch 'maint-0.3.2' 2017-11-15 15:11:30 -05:00
Nick Mathewson 56b7407a90 Merge branch 'bug24279_030' into maint-0.3.2 2017-11-15 15:11:26 -05:00
Nick Mathewson 7548805850 whoops; add missing credit. 2017-11-15 15:11:15 -05:00
Nick Mathewson 67c62394bc Merge branch 'bug24279_030' into maint-0.3.2 2017-11-15 15:09:33 -05:00
Nick Mathewson f28559fd2a Changes file for 24279. 2017-11-15 15:09:11 -05:00
Alex Xu (Hello71) 74b7bfbe47 Fix configure libevent memory leak 
Breaks build with externally-specified hardening flags.
 2017-11-15 15:07:49 -05:00
Nick Mathewson ceeacc734d Merge branch 'maint-0.3.2' 2017-11-15 14:25:25 -05:00
Nick Mathewson ae8683621a Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2 2017-11-15 14:25:20 -05:00
Nick Mathewson bf8a7201ce Remove remove_file_if_very_old() -- nothing calls it. 2017-11-14 15:33:58 -05:00
Nick Mathewson 702a13c9d3 Merge branch 'maint-0.3.2' 2017-11-14 14:45:11 -05:00
Nick Mathewson 6dc784bdb3 Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2 2017-11-14 14:45:07 -05:00
George Kadianakis c4a56ed5c2 Silence a warning about failed descriptor uploads. 
Due to #23662 this can happen under natural causes and does not disturb
the functionality of the service. This is a simple 0.3.2 fix for now,
and we plan to fix this properly in 0.3.3.
 2017-11-14 17:16:33 +02:00
Nick Mathewson 50fbede459 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-11-13 20:36:04 -05:00
Nick Mathewson fe04a19cb7 Merge branch 'maint-0.3.2' 2017-11-13 20:36:04 -05:00
Nick Mathewson 6059784be0 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-11-13 20:36:04 -05:00
Nick Mathewson 1d5e693b63 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-11-13 20:36:04 -05:00
Nick Mathewson 1b9bb2c847 Merge branch 'bug22895_027' into maint-0.2.9 2017-11-13 20:35:59 -05:00
Nick Mathewson 5a9b0374a0 Merge branch 'maint-0.3.2' 2017-11-13 16:58:21 -05:00
Nick Mathewson 985c41b500 add a missing subcategory to 23637, again 2017-11-13 16:58:11 -05:00
Nick Mathewson fea5c8a015 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-11-13 12:57:58 -05:00
Nick Mathewson 562b3c9678 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-11-13 12:57:58 -05:00
Nick Mathewson 543fd89fb7 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-11-13 12:57:58 -05:00
Nick Mathewson a5a87c1d97 Merge branch 'maint-0.3.2' 2017-11-13 12:57:58 -05:00
Nick Mathewson 05ae995665 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-11-13 12:57:58 -05:00
Nick Mathewson 800797e7f3 Merge branch 'bug23291_028' into maint-0.2.8 2017-11-13 12:57:55 -05:00
Nick Mathewson 0c6d05cdd4 Merge branch 'maint-0.3.2' 2017-11-13 12:27:44 -05:00
Nick Mathewson d0b75b5ade Merge branch 'maint-0.3.1' into maint-0.3.2 2017-11-13 12:27:36 -05:00
David Goulet 7df28ce299 hs-v3: Fix consensus param "hsdir-interval" name 
The dir-spec.txt specifies it to be "hsdir_interval" (underscore).

Fixes #24262

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-11-13 11:48:56 -05:00
Nick Mathewson 527eb563cb Remove changes files for those items already merged in 0.3.2 2017-11-13 11:45:55 -05:00
Nick Mathewson 0b4e59b7c6 Merge remote-tracking branch 'sebastian/bug24137' 2017-11-13 11:32:35 -05:00
Nick Mathewson 45fb624e38 Merge branch 'maint-0.3.2' 2017-11-13 11:20:23 -05:00
Nick Mathewson 3300a6e93a Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2 2017-11-13 11:20:20 -05:00
Nick Mathewson e209e8e3c1 Merge branch 'maint-0.3.2' 2017-11-13 11:19:12 -05:00
Nick Mathewson cf1e6ad2d7 Merge branch 'bug24247_032' into maint-0.3.2 2017-11-13 11:19:09 -05:00
Nick Mathewson 16bdb9e365 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-11-13 11:18:02 -05:00
Nick Mathewson 91188540af Merge branch 'maint-0.3.0' into maint-0.3.1 2017-11-13 11:18:02 -05:00
Nick Mathewson b9da340cdf Merge branch 'maint-0.3.2' 2017-11-13 11:18:02 -05:00
Nick Mathewson 6f9ab69b6d Merge branch 'maint-0.3.1' into maint-0.3.2 2017-11-13 11:18:02 -05:00
Nick Mathewson ab415ae950 Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9 2017-11-13 11:17:58 -05:00
Nick Mathewson 9092e9019a Merge branch 'maint-0.2.9' into maint-0.3.0 2017-11-13 11:15:50 -05:00
Nick Mathewson 89b9951ecd Merge branch 'maint-0.3.0' into maint-0.3.1 2017-11-13 11:15:50 -05:00
Nick Mathewson 122ee5b13a Merge branch 'maint-0.3.2' 2017-11-13 11:15:50 -05:00
Nick Mathewson 7dddef2a76 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-11-13 11:15:50 -05:00
Nick Mathewson 666653758d Merge branch 'bug8185_025' into maint-0.2.9 2017-11-13 11:15:47 -05:00
Nick Mathewson 0fc2b7f82e Merge branch 'bug8185_031' into maint-0.3.1 2017-11-13 11:15:40 -05:00
Nick Mathewson ece63105d9 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-11-13 11:13:22 -05:00
Nick Mathewson e53daee2f4 Merge branch 'maint-0.3.2' 2017-11-13 11:13:22 -05:00
Nick Mathewson 441bfcd885 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-11-13 11:13:22 -05:00
Nick Mathewson 2777b469fa Merge branch 'maint-0.3.0' into maint-0.3.1 2017-11-13 11:13:22 -05:00