 Nick Mathewson
|
abc22e8f1c
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-09-12 09:23:57 -04:00 |
|
|
Nick Mathewson
|
bac160b4e0
|
One more implicit fallthrough warning to fix on GCC 7
|
2017-09-12 09:22:50 -04:00 |
|
|
Nick Mathewson
|
2cae7c8a29
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-09-11 17:49:18 -04:00 |
|
 Andreas Stieger
|
6cd5a80275
|
Fix GCC 7 -Wimplicit-fallthrough warnings
Add magic comments recognized by default -Wimplicit-fallthrough=3
or break, as required.
|
2017-09-11 17:47:04 -04:00 |
|
|
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
|
40f385dee7
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
2fc33716ef
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
5c2a3854d3
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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 |
|
|
Nick Mathewson
|
bcf2b413c3
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
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
|
9914f906e3
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
93b28972c1
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
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
|
ad54a025d6
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
9191069891
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
50b8a449b5
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
4d0a8f53ed
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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
|
0e7558ab64
|
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
|
2017-08-01 11:19:29 -04:00 |
|
|
Nick Mathewson
|
170b58b73b
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
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 |
|
|
Nick Mathewson
|
a48ae2aa67
|
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
|
2017-08-01 11:19:29 -04:00 |
|
|
Nick Mathewson
|
6862eada65
|
Merge branch 'maint-0.2.5' into maint-0.2.6
|
2017-08-01 11:19:29 -04:00 |
|
|
Nick Mathewson
|
0bfd1c318c
|
Merge branch 'maint-0.2.4' into maint-0.2.5
|
2017-08-01 11:19:28 -04:00 |
|
|
Nick Mathewson
|
6199e27a2b
|
Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4
|
2017-08-01 11:19:24 -04:00 |
|
|
Nick Mathewson
|
b858f22c55
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-07-27 08:23:36 -04:00 |
|
|
Nick Mathewson
|
24ddf5862e
|
Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
|
2017-07-27 08:23:34 -04:00 |
|
|
Nick Mathewson
|
5c5eb0f095
|
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
|
2017-07-26 15:39:55 -04:00 |
|
|
Nick Mathewson
|
ddd66cc019
|
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
|
2017-07-26 15:39:55 -04:00 |
|
|
Nick Mathewson
|
f794b40ec0
|
Merge branch 'maint-0.2.5' into maint-0.2.6
|
2017-07-26 15:39:55 -04:00 |
|
|
Nick Mathewson
|
af39c13a03
|
Merge branch 'maint-0.2.4' into maint-0.2.5
|
2017-07-26 15:39:55 -04:00 |
|
|
Nick Mathewson
|
a76315be59
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-07-26 15:39:55 -04:00 |
|
|
Nick Mathewson
|
f17f7a4fdf
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-07-26 15:39:55 -04:00 |
|
|
Nick Mathewson
|
ebb441ded2
|
Point travis to #tor-ci, not #tor-bots
|
2017-07-26 15:39:50 -04:00 |
|
|
Nick Mathewson
|
4d157075f9
|
Merge branch 'maint-0.2.9' into release-0.2.9
|
2017-07-26 15:38:48 -04:00 |
|
|
Nick Mathewson
|
f226d6460d
|
Travis update: "gcc-warnings" became "fatal-warnings" in 0.2.9
|
2017-07-26 15:37:00 -04:00 |
|
|
Nick Mathewson
|
dcc477cb53
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-07-26 15:35:17 -04:00 |
|
|
Nick Mathewson
|
fbf93614c9
|
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
|
2017-07-26 15:35:07 -04:00 |
|
|
Nick Mathewson
|
c362c6a852
|
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
|
2017-07-26 15:35:01 -04:00 |
|
|
Nick Mathewson
|
0ad5a6b034
|
Merge branch 'maint-0.2.5' into maint-0.2.6
|
2017-07-26 15:34:56 -04:00 |
|
|
Nick Mathewson
|
09618bc488
|
Merge branch 'maint-0.2.4' into maint-0.2.5
|
2017-07-26 15:34:40 -04:00 |
|