Commit Graph

24857 Commits

Author SHA1 Message Date
Andreas Stieger b81a2e8f46 Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)
Add magic comments recognized by default -Wimplicit-fallthrough=3
Follow-up to e5f464, fixes Ticket 22446 for 32 bit.

[nick notes: Backport from 0.3.1.3-alpha.]
2017-09-11 17:45:07 -04:00
Nick Mathewson c3debdfe6c Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-11 16:29:10 -04:00
Nick Mathewson c894e9d3d4 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-11 16:29:10 -04:00
Nick Mathewson 6a49e3360b Fix mixed-sign comparison warning in fix for 22797. 2017-09-11 16:29:06 -04:00
Nick Mathewson a25d97e530 Merge branch 'teor-bug22797-025' into maint-0.2.9 2017-09-11 16:28:59 -04:00
Nick Mathewson 3a7e2ce1b6 Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-08 08:24:47 -04:00
Nick Mathewson f5092e711f Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-08 08:24:47 -04:00
Nick Mathewson 3cace828a9 Merge branch 'bug22644_029' into maint-0.2.9 2017-09-08 08:24:36 -04:00
Nick Mathewson 4c21daa9e2 Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-07 15:18:01 -04:00
Nick Mathewson a9d4df9a08 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-07 15:18:01 -04:00
Nick Mathewson bcf2b413c3 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-09-07 15:18:00 -04:00
Nick Mathewson 08592c95fa Merge branch 'maint-0.2.8' into maint-0.2.9 2017-09-07 15:18:00 -04:00
Karsten Loesing 09618ffe38 Update geoip and geoip6 to the September 6 2017 database. 2017-09-07 21:06:16 +02:00
Nick Mathewson 12dad5ebf7 Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha
respectively.
2017-09-07 09:20:00 -04:00
Nick Mathewson b943cedf34 changes file for bug 23291 2017-08-21 15:04:35 -04:00
Ties Stuij 7ba873ca2d 22839: fix check_heap_buffer buffer size in test-memwipe 2017-08-21 15:03:54 -04:00
Nick Mathewson 923efa3db8 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-03 09:14:12 -04:00
Nick Mathewson b548371f76 Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0 2017-08-03 09:12:23 -04:00
Nick Mathewson 3e68db02c4 In ntmain, call set_main_thread() before running the loop.
Patch from Vort; fixes bug 23081; bugfix on fd992deeea in
0.2.1.16-rc when set_main_thread() was introduced.

See the changes file for a list of all the symptoms this bug has
been causing when running Tor as a Windows Service.
2017-08-03 09:09:08 -04:00
Nick Mathewson 93b28972c1 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-08-03 08:44:31 -04:00
Nick Mathewson 9696021593 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-08-03 08:44:31 -04:00
Nick Mathewson 75e0843893 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-03 08:44:31 -04:00
Nick Mathewson f33c96610f Merge branch 'maint-0.2.9' into maint-0.3.0 2017-08-03 08:44:31 -04:00
Karsten Loesing 1280de42a4 Update geoip and geoip6 to the August 3 2017 database. 2017-08-03 10:00:54 +02:00
Nick Mathewson abe5b07c13 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-02 12:29:42 -04:00
Nick Mathewson 8925e84beb version bump to 0.3.0.10-dev 2017-08-02 12:28:34 -04:00
Nick Mathewson c33db290a9 Remove an extraneous "alpha". 2017-08-02 11:50:57 -04:00
Nick Mathewson 514212ed66 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-01 14:39:08 -04:00
Nick Mathewson 4f7955d5de Bump to 0.3.0.10 2017-08-01 14:38:49 -04:00
David Goulet ff9c529667 hs: Cleanup logging statement in hs_intropoint.c
One log statement was a warning and has been forgotten. It is triggered for a
successful attempt at introducting from a client.

It has been reported here:
https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html

Three other log_warn() statement changed to protocol warning because they are
errors that basically can come from the network and thus triggered by anyone.

Fixes #23078.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-01 14:15:47 -04:00
Nick Mathewson df16f89a8a copy 0.3.0.10 into releasenotes 2017-08-01 13:17:50 -04:00
Nick Mathewson a0d0e8842c Build a changelog for 0.3.0.10 2017-08-01 11:50:07 -04:00
Nick Mathewson 4d26203528 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-08-01 11:30:33 -04:00
Nick Mathewson 33d693fc74 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-01 11:30:33 -04:00
Nick Mathewson 58e1c6dd86 Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9 2017-08-01 11:30:29 -04:00
Nick Mathewson 59cd249335 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-01 11:28:40 -04:00
Nick Mathewson f69797b67c Merge branch 'maint-0.2.9' into maint-0.3.0 2017-08-01 11:28:39 -04:00
Nick Mathewson 8500f0e4e1 Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9 2017-08-01 11:28:36 -04:00
Nick Mathewson 93d376d8b3 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-01 11:24:09 -04:00
Nick Mathewson 84c4a2bc3f Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0 2017-08-01 11:24:02 -04:00
Nick Mathewson 7902c2fa05 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-01 11:23:00 -04:00
Nick Mathewson 7c68b2f1a5 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-08-01 11:23:00 -04:00
Nick Mathewson 2b94b0ea72 Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9 2017-08-01 11:22:42 -04:00
Nick Mathewson 136fb78f40 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-01 11:21:19 -04:00
Nick Mathewson 1d48712c28 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-08-01 11:21:19 -04:00
Nick Mathewson f6ecda8400 Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9 2017-08-01 11:21:14 -04:00
Nick Mathewson bc4a44e426 Merge branch 'maint-0.3.0' into release-0.3.0 2017-08-01 11:19:30 -04:00
Nick Mathewson 9d24a352c0 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-08-01 11:19:30 -04:00
Nick Mathewson 0e7558ab64 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-08-01 11:19:29 -04:00
Nick Mathewson 925ef048a9 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-08-01 11:19:29 -04:00