George Kadianakis
e77ad795c6
Merge branch 'tor-github/pr/1322'
2019-09-25 14:13:44 +03:00
George Kadianakis
99f75373de
Merge branch 'tor-github/pr/1309'
2019-09-25 14:12:42 +03:00
teor
0cb57a4908
feature/control: add a missing word to the send_control_done() comment
2019-09-24 15:08:37 +10:00
Roger Dingledine
e1429d9148
fix typo in comment
2019-09-23 18:32:05 -04:00
Nick Mathewson
c309169217
microdesc_parse: convert some ints to bools
...
Noted by ahf during review of #31675
2019-09-19 14:37:24 -04:00
Nick Mathewson
6100378c29
changes file for microdesc_parse refactoring.
2019-09-19 14:37:24 -04:00
Nick Mathewson
2e1989dacc
Remove practracker exception for microdesc parsing function
2019-09-19 14:37:24 -04:00
Nick Mathewson
194884977c
microdesc_parse: Rename "next" label to "err".
2019-09-19 14:37:24 -04:00
Nick Mathewson
2094796c24
Reindent microdesc_parse_fields().
...
I suggest reviewing this with -b: it should be whitespace-only.
2019-09-19 14:37:24 -04:00
Nick Mathewson
ec368409fa
Extract field-parsing code for microdesc_parse.c
...
The code here parses the fields from the microdescriptor, including
possible annotations, and stores them into a microdesc_t object.
This commit is almost pure code movement; I recommend using
--color-moved to review it.
2019-09-19 14:37:24 -04:00
Nick Mathewson
b1552e8814
Reindent microdesc_extract_body().
...
This commit is whitespace-only; I suggest reviewing with -b.
2019-09-19 14:37:24 -04:00
Nick Mathewson
9cbc166ea0
Extract the body-copying portion of microdesc parsing
...
This code is logically independent of the rest of the function, and
goes better in its own function.
This is almost purely code movement; I suggest reviewing with
--color-moved.
2019-09-19 14:37:24 -04:00
Nick Mathewson
e6c5b248ae
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump
2019-09-19 08:52:42 -04:00
Nick Mathewson
6f3f93d86c
bump to 0.4.1.6-dev
2019-09-19 08:52:15 -04:00
Nick Mathewson
b01bd73d92
Copy 0.4.1.6 block into changelog/releasenotes in master
2019-09-19 08:38:50 -04:00
Nick Mathewson
387cfccee4
Add a coccinelle script to look for {inc,dec}rements in log_debug
...
We want to forbid this pattern since, unlike the other log_*()
macros, log_debug() conditionally evaluates its arguments only if
debug-level logging is enabled. Thus, a call to
log_debug("%d", x++);
will only increment x if debugging logs are enabled, which is
probably not what the programmer intended.
One bug caused by this pattern was #30628 .
This script detects log_debug( ) calls with any of E++, E--, ++E,
or --E in their arguments, where E is an arbitrary expression.
Closes ticket 30743.
2019-09-18 13:43:42 -04:00
Nick Mathewson
d6d3e829dd
Merge branch 'maint-0.4.1'
2019-09-18 08:07:56 -04:00
Nick Mathewson
70bcff6010
Merge branch 'bug31772_041' into maint-0.4.1
2019-09-18 08:07:50 -04:00
Nick Mathewson
7225cfc586
Merge branch 'maint-0.4.1'
2019-09-17 21:28:38 -04:00
Nick Mathewson
5f00c03ed0
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:28:38 -04:00
Nick Mathewson
9e674d0eb4
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:28:37 -04:00
Nick Mathewson
02840169d8
Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5
2019-09-17 21:28:29 -04:00
Nick Mathewson
2013e63acc
Merge branch 'maint-0.4.1'
2019-09-17 21:26:32 -04:00
Nick Mathewson
c3e94a8ccd
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:26:32 -04:00
Nick Mathewson
a1f97bb253
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:26:31 -04:00
Nick Mathewson
50b45c43eb
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-09-17 21:26:31 -04:00
Nick Mathewson
967460389a
Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9
2019-09-17 21:26:17 -04:00
Nick Mathewson
25af8ada30
Correct the syntax description for the MAPADDRESS command.
...
In 0.4.1.1-alpha I introduced a bug where we would require and
ignore a single positional argument.
Fixes bug 31772.
2019-09-17 19:26:45 -04:00
Nick Mathewson
93def2bb4f
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-09-17 19:12:08 -04:00
Nick Mathewson
a3342b382a
Bump version to 0.4.1.6
2019-09-17 19:11:56 -04:00
Nick Mathewson
48afec91ce
Merge branch 'maint-0.4.1'
2019-09-17 19:05:13 -04:00
Nick Mathewson
c6f7943269
Merge branch 'bug31570_041' into maint-0.4.1
2019-09-17 19:04:25 -04:00
Nick Mathewson
48b2815879
Merge branch 'maint-0.4.1'
2019-09-17 18:58:44 -04:00
Nick Mathewson
50f981719f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:58:44 -04:00
Nick Mathewson
ef35435584
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 18:58:43 -04:00
Nick Mathewson
dc41e6a80c
Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
2019-09-17 18:58:06 -04:00
Nick Mathewson
2ebe1fcd52
Merge branch 'maint-0.2.9' into maint-0.3.5
...
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.
2019-09-17 18:57:49 -04:00
Nick Mathewson
dcd6462605
Merge branch 'maint-0.4.1'
2019-09-17 18:56:52 -04:00
Nick Mathewson
cec42be570
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:56:52 -04:00
Nick Mathewson
88cf964ca3
Merge branch 'maint-0.4.1'
2019-09-17 18:55:18 -04:00
Nick Mathewson
ab74c3560a
Merge branch 'ticket31552_041' into maint-0.4.1
2019-09-17 18:54:05 -04:00
Nick Mathewson
75d3c08219
bump to 0.4.2.1-alpha-dev
2019-09-17 11:36:43 -04:00
Nick Mathewson
b5f39955d1
pick a release date for 0.4.2.1-alpha
2019-09-17 08:19:28 -04:00
Nick Mathewson
9bbddbcb21
Run format_changelog again
2019-09-17 08:00:47 -04:00
Nick Mathewson
1f0848e0b6
Fold new entries into 0.4.2.1-alpha changelog
2019-09-17 08:00:24 -04:00
George Kadianakis
585eaa123f
Merge branch 'tor-github/pr/1323'
2019-09-17 14:51:43 +03:00
Nick Mathewson
a28a682a1f
bump version to 0.4.2.1-alpha
2019-09-16 16:24:24 -04:00
Nick Mathewson
68a0106bf3
Run "make autostyle" and fix wide lines.
2019-09-16 13:27:42 -04:00
Nick Mathewson
7cd68b04de
Fold one more entry into changelog.
2019-09-16 12:50:56 -04:00
George Kadianakis
8f2ab45229
Merge branch 'tor-github/pr/1313'
2019-09-16 19:45:20 +03:00
