 Nick Mathewson
|
cade65fd2e
|
Add "check-includes" to check-local.
|
2018-07-09 15:55:03 -04:00 |
|
|
Nick Mathewson
|
294f580f04
|
Re-wrap the error message emitted by checkIncludes.py
|
2018-07-09 15:48:55 -04:00 |
|
|
Nick Mathewson
|
3145e469d8
|
Make checkIncludes work on python 2.7
|
2018-07-09 15:46:39 -04:00 |
|
|
Nick Mathewson
|
f8766e8878
|
Merge branch 'maint-0.3.4'
"ours" to avoid a pair of version bumps.
|
2018-07-09 15:17:59 -04:00 |
|
|
Nick Mathewson
|
d7ad6d924e
|
Merge branch 'maint-0.3.3' into maint-0.3.4
"ours" to avoid version bump.
|
2018-07-09 15:17:48 -04:00 |
|
|
Nick Mathewson
|
5ce348c4c7
|
Bump to 0.3.4.4-rc-dev
|
2018-07-09 15:17:38 -04:00 |
|
|
Nick Mathewson
|
f5e3bcb60b
|
Bump to 0.3.3.8-dev.
|
2018-07-09 15:17:16 -04:00 |
|
|
Nick Mathewson
|
57b1cc1f74
|
Copy notes from today's releases into master
|
2018-07-09 15:16:22 -04:00 |
|
|
Nick Mathewson
|
19f2057d49
|
Fix some lingering windows compilation issues from Jenkins.
These were caused by the recent refactoring.
|
2018-07-09 12:54:40 -04:00 |
|
|
Nick Mathewson
|
eb856a3e51
|
strcasecmp should not take a size_t argument
|
2018-07-09 11:17:23 -04:00 |
|
|
Nick Mathewson
|
cec8d4aa92
|
Remove changes files for items that will appear in 0.3.4.4-rc
|
2018-07-09 10:30:12 -04:00 |
|
|
Nick Mathewson
|
98dff5df3f
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2018-07-09 10:17:20 -04:00 |
|
|
Nick Mathewson
|
250e0fc1c4
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-07-09 10:17:20 -04:00 |
|
|
Nick Mathewson
|
1b81c4b5f3
|
Merge branch 'maint-0.3.4'
|
2018-07-09 10:17:20 -04:00 |
|
|
Nick Mathewson
|
6ad2c2b92f
|
Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2
|
2018-07-09 10:17:17 -04:00 |
|
|
Nick Mathewson
|
e7463be39b
|
Merge branch 'maint-0.3.4'
|
2018-07-09 10:16:51 -04:00 |
|
|
Nick Mathewson
|
83de46eb25
|
Changes file and comment for 25928.
|
2018-07-09 10:16:48 -04:00 |
|
|
Nick Mathewson
|
529faef28e
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2018-07-09 10:15:16 -04:00 |
|
|
Nick Mathewson
|
69918629f5
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-07-09 10:14:43 -04:00 |
|
|
Nick Mathewson
|
4a604d9938
|
Merge branch 'maint-0.2.9' into maint-0.3.2
|
2018-07-09 10:14:43 -04:00 |
|
|
Nick Mathewson
|
8b53dfc362
|
Merge branch 'bug26269_029' into maint-0.2.9
|
2018-07-09 10:14:39 -04:00 |
|
|
Nick Mathewson
|
7746b071d8
|
Merge remote-tracking branch 'gsomlo/gls-single-da'
|
2018-07-09 09:59:46 -04:00 |
|
|
Nick Mathewson
|
4ff93dd94f
|
Merge remote-tracking branch 'rl1987/doc26638'
|
2018-07-09 09:40:04 -04:00 |
|
|
Nick Mathewson
|
a1a55a33c2
|
Merge branch 'bug26488'
|
2018-07-09 09:37:14 -04:00 |
|
 rl1987
|
46998fc8fd
|
Validate that DirAuthority address is IPv4
|
2018-07-09 09:37:09 -04:00 |
|
|
Nick Mathewson
|
03283c00d8
|
Merge remote-tracking branch 'rl1987/bug26525'
|
2018-07-09 09:31:12 -04:00 |
|
|
Nick Mathewson
|
47859e11e5
|
Merge branch 'maint-0.3.4'
"Ours" to avoid version bump.
|
2018-07-09 09:24:37 -04:00 |
|
|
Nick Mathewson
|
afee785417
|
Merge branch 'maint-0.3.3' into maint-0.3.4
"ours" merge to avoid version bump
|
2018-07-09 09:24:14 -04:00 |
|
|
Nick Mathewson
|
532873a924
|
Bump to 0.3.3.8
|
2018-07-09 09:24:07 -04:00 |
|
|
Nick Mathewson
|
9320100d6e
|
Bump to 0.3.3.4-rc
|
2018-07-09 09:23:39 -04:00 |
|
|
Nick Mathewson
|
790062d720
|
Merge branch 'maint-0.3.4'
|
2018-07-09 09:22:13 -04:00 |
|
|
Nick Mathewson
|
b74ed31f90
|
Merge branch 'maint-0.3.3' into maint-0.3.4
"ours" merge to avoid cherry-picked copy of #25512 fix, which is already in
this branch.
|
2018-07-09 09:21:46 -04:00 |
|
|
Nick Mathewson
|
a95cfb8a58
|
Clear all control.c flags on control_free_all()
Fixes bug 25512.
(Cherry-picked from 3519d0c808
|
2018-07-09 09:20:45 -04:00 |
|
|
Nick Mathewson
|
8e3a52e5c3
|
Merge branch 'maint-0.3.4'
|
2018-07-09 09:14:41 -04:00 |
|
|
Nick Mathewson
|
75d9db9e5b
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2018-07-09 09:14:37 -04:00 |
|
|
Nick Mathewson
|
f721a08220
|
Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3
|
2018-07-09 09:13:58 -04:00 |
|
|
Nick Mathewson
|
75f7064a13
|
Merge branch 'maint-0.3.4'
|
2018-07-09 09:11:42 -04:00 |
|
|
Nick Mathewson
|
d3894dc34b
|
Merge branch 'maint-0.2.9' into maint-0.3.2
|
2018-07-09 09:11:41 -04:00 |
|
|
Nick Mathewson
|
1af69c1812
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2018-07-09 09:11:41 -04:00 |
|
|
Nick Mathewson
|
451a84cecb
|
Merge branch 'maint-0.3.2' into maint-0.3.3
|
2018-07-09 09:11:41 -04:00 |
|
|
Nick Mathewson
|
844fc5eecb
|
Merge branch 'maint-0.3.4'
|
2018-07-09 09:09:02 -04:00 |
|
|
Nick Mathewson
|
9b9625bdfa
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2018-07-09 09:09:01 -04:00 |
|
|
Nick Mathewson
|
fead22fb2a
|
Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3
|
2018-07-09 09:08:58 -04:00 |
|
|
Nick Mathewson
|
b8554dd880
|
Make Tor compile with --disable-memory-sentinels again
|
2018-07-09 08:44:16 -04:00 |
|
 Karsten Loesing
|
9faa28b60e
|
Update geoip and geoip6 to the July 3 2018 database.
|
2018-07-06 20:54:03 +02:00 |
|
|
Nick Mathewson
|
10c782d7fa
|
Move ntmain.c into libtor-app again
It's needed by main.c
Fixes bug 26662; bug not in any released Tor.
|
2018-07-06 13:59:40 -04:00 |
|
|
Nick Mathewson
|
8b0920bb6f
|
Merge branch 'split_or_directory'
|
2018-07-05 18:13:06 -04:00 |
|
|
Nick Mathewson
|
50963f36d7
|
Actually sort the lines in src/core/include.am
|
2018-07-05 17:15:50 -04:00 |
|
|
Nick Mathewson
|
667a6e8fe9
|
Whoops. Protover.[ch] belong in src/core/or
|
2018-07-05 17:15:50 -04:00 |
|
|
Nick Mathewson
|
f720a5a439
|
Fix everything that previously referred to src/or
|
2018-07-05 17:15:50 -04:00 |
|