Nick Mathewson
0e6e902cbc
Merge branch 'document_--version'
2018-12-20 11:50:48 -05:00
Nick Mathewson
973a5db808
Merge remote-tracking branch 'tor-github/pr/445'
2018-12-20 07:53:57 -05:00
Nick Mathewson
9c6283732a
Merge branch 'maint-0.3.5'
2018-12-20 07:50:04 -05:00
Nick Mathewson
ef97543270
Merge remote-tracking branch 'tor-github/pr/607' into maint-0.3.5
2018-12-20 07:49:59 -05:00
teor
02009c66c0
Stop running stem's unit tests as part of "make test-stem"
...
But continue to run stem's unit and online tests during
"make test-stem-full".
Fixes bug 28568; bugfix on 0.2.6.3-alpha.
2018-12-20 13:01:18 +10:00
Nick Mathewson
1c47459e5a
Merge branch 'maint-0.3.5'
2018-12-19 15:36:08 -05:00
Nick Mathewson
b7018b1a24
Merge branch 'ticket28883_035' into maint-0.3.5
2018-12-19 15:36:03 -05:00
Nick Mathewson
ed0bc85ed0
Merge branch 'ticket28853'
2018-12-18 18:59:56 -05:00
Nick Mathewson
bb091da1e7
Merge branch 'ticket28839_v2_squashed'
2018-12-18 18:59:05 -05:00
Nick Mathewson
976c62e62a
Changes file for ticket28839
2018-12-18 18:58:08 -05:00
Nick Mathewson
372df7a630
Merge branch 'maint-0.3.5'
2018-12-18 13:56:22 -05:00
Nick Mathewson
26bbeb298d
Merge branch 'bug28612_squashed' into maint-0.3.5
2018-12-18 13:55:57 -05:00
Nick Mathewson
1c2abea30a
Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().
...
Fixes bug 28612; bugfix on 0.3.5.3-alpha.
2018-12-18 13:55:08 -05:00
Nick Mathewson
0af0f78dff
Merge branch 'maint-0.3.5'
2018-12-18 13:52:39 -05:00
Nick Mathewson
702fd6f0f2
Merge branch 'ticket28881_035' into maint-0.3.5
2018-12-18 13:52:36 -05:00
Nick Mathewson
4894d44ab8
Always initialize addr in parse_port_config()
...
It was always analyzed before use, but scan-build wasn't able to
persuade itself of that.
Closes ticket 28881.
2018-12-18 13:52:25 -05:00
Nick Mathewson
a3e6f2467b
Merge remote-tracking branch 'tor-github/pr/595'
2018-12-18 13:51:21 -05:00
Nick Mathewson
872998dd00
Merge branch 'ticket28179_squashed_merged'
2018-12-18 13:36:34 -05:00
Alexander Færøy
44a80bb361
Add missing changes files for #26360 , #28179 , #28180 .
...
See: https://bugs.torproject.org/26179
See: https://bugs.torproject.org/28180
See: https://bugs.torproject.org/28360
2018-12-18 13:36:08 -05:00
Nick Mathewson
90187b1bfc
Remove changes that are already merged in 0.3.5.x releases
2018-12-18 08:15:38 -05:00
Nick Mathewson
c61cd5775c
Revert "Log bootstrap tag names"
...
This reverts commit 1b855af5e3
2018-12-18 08:09:43 -05:00
Nick Mathewson
508837b62b
Document the output of --version
...
Closes 28889
2018-12-17 17:54:01 -05:00
Nick Mathewson
5a22b42c3a
Merge branch 'maint-0.3.5'
2018-12-17 10:57:51 -05:00
Nick Mathewson
1a9a9fc0ff
Changes file for 28562
2018-12-17 10:57:47 -05:00
Nick Mathewson
315c21d2e2
test_rebind: wait for tor to timeout, even if it is logging a lot
...
Fixes bug 28883; bugfix on 0.3.5.4-alpha.
2018-12-17 09:53:17 -05:00
Nick Mathewson
3dd1f064a7
Rewrite the core of parse_short_policy() to be faster.
...
The old implementation did some funky out-of-order lexing, and
tended to parse every port twice if the %d-%d pattern didn't match.
Closes ticket 28853.
2018-12-14 16:07:10 -05:00
Matt Traudt
06046c726f
Add changes file for <30min HeartbeatPeriod patch
2018-12-14 09:24:19 -05:00
Nick Mathewson
f8dac5c900
Merge branch 'maint-0.3.5'
2018-12-13 19:01:29 -05:00
Nick Mathewson
94a7998158
Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
2018-12-13 18:57:00 -05:00
Nick Mathewson
69264f96f3
Merge branch 'dormant_persist_squashed'
2018-12-13 08:26:10 -05:00
Nick Mathewson
c037bf5817
changes file for ticket26864
2018-12-13 08:25:54 -05:00
Nick Mathewson
91be6a77e9
Merge remote-tracking branch 'teor/ticket24838'
2018-12-11 10:04:16 -05:00
Nick Mathewson
b2625b09f1
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 10:00:22 -05:00
Nick Mathewson
1983426073
Merge branch 'maint-0.3.5'
2018-12-11 10:00:22 -05:00
Nick Mathewson
633813e313
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 10:00:22 -05:00
Nick Mathewson
93019b4787
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 10:00:22 -05:00
Nick Mathewson
3b5188576f
Note ticket number in changes file for 24803
2018-12-11 10:00:19 -05:00
Nick Mathewson
b915b6cd21
Merge remote-tracking branch 'github/prop297'
2018-12-11 09:44:57 -05:00
Nick Mathewson
e1273d7d1b
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 09:41:05 -05:00
Nick Mathewson
6506b1ee9f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 09:41:05 -05:00
Nick Mathewson
27e4269929
Merge branch 'maint-0.3.5'
2018-12-11 09:41:05 -05:00
Nick Mathewson
c1f9191581
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 09:41:04 -05:00
Nick Mathewson
58d2ced572
Merge remote-tracking branch 'teor/24805-phoul'
2018-12-11 09:38:27 -05:00
Nick Mathewson
ce501a529f
Merge remote-tracking branch 'catalyst-github/ticket27402'
2018-12-11 09:37:41 -05:00
Nick Mathewson
b65166750d
Merge remote-tracking branch 'rl1987/ticket28007_take2'
2018-12-11 09:25:46 -05:00
Nick Mathewson
c4c372f281
Merge remote-tracking branch 'rl1987/ticket28551'
2018-12-11 09:24:35 -05:00
Taylor Yu
1b855af5e3
Log bootstrap tag names
...
Add the bootstrap tag name to the log messages, so people
troubleshooting connection problems can look up a symbol instead of a
number. Closes ticket 28731.
2018-12-10 17:22:28 -06:00
teor
4991b29311
Fallbacks: Update the hard-coded fallback list in December 2018
...
Merge Phoul's two lists into teor's list.
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
157 fallbacks (92 new, 65 existing, 85 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-10 17:02:19 +10:00
teor
d9b9c1fa76
Changes file for 24805
2018-12-07 17:04:50 +10:00
teor
78e177d622
Fallbacks: Update the hard-coded fallback list in December 2018
...
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
148 fallbacks (89 new, 59 existing, 91 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-07 16:43:10 +10:00
