Nick Mathewson
97046436b2
Merge branch 'maint-0.3.2'
2017-10-23 08:59:12 -04:00
Nick Mathewson
b8dedaee74
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:59:11 -04:00
Nick Mathewson
df57d1e0c0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:59:11 -04:00
Nick Mathewson
783e458c07
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:59:11 -04:00
Nick Mathewson
c958fda6e2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:59:11 -04:00
Nick Mathewson
9a1b385462
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 08:58:28 -04:00
Nick Mathewson
c018aa8196
Merge branch 'maint-0.3.2'
2017-10-23 08:53:25 -04:00
Nick Mathewson
578eead1c8
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:53:25 -04:00
Nick Mathewson
b68de63eb6
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:53:25 -04:00
Nick Mathewson
74e8fd22c9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:53:25 -04:00
Nick Mathewson
132e2f69b1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:53:25 -04:00
Nick Mathewson
6f87a85897
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
2017-10-23 08:53:14 -04:00
Nick Mathewson
1693cee66e
Merge branch 'maint-0.3.2'
2017-10-23 08:47:59 -04:00
Nick Mathewson
bae96cf1dc
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:47:59 -04:00
Nick Mathewson
9120ac2218
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:47:58 -04:00
Nick Mathewson
35574d4a9a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:47:58 -04:00
Nick Mathewson
fcaf3335b4
Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9
2017-10-23 08:47:52 -04:00
Nick Mathewson
1949c78237
Merge branch 'maint-0.3.2'
2017-10-23 08:46:30 -04:00
Nick Mathewson
a46288252b
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-23 08:46:29 -04:00
Nick Mathewson
5d37d27007
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:46:29 -04:00
Nick Mathewson
d29e4c0597
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:46:29 -04:00
Nick Mathewson
68dea082e7
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
2017-10-23 08:46:26 -04:00
Nick Mathewson
35746a9ee7
Comment-only change: annotate exit() calls.
...
Sometimes when we call exit(), it's because the process is
completely hopeless: openssl has a broken AES-CTR implementation, or
the clock is in the 1960s, or something like that.
But sometimes, we should return cleanly from tor_main() instead, so
that embedders can keep embedding us and start another Tor process.
I've gone through all the exit() and _exit() calls to annotate them
with "exit ok" or "XXXX bad exit" -- the next step will be to fix
the bad exit()s.
First step towards 23848.
2017-10-19 13:42:28 -04:00
Nick Mathewson
0956242158
Mark some unreachable code in compat_winthreads.c as unreachable
2017-10-19 13:21:48 -04:00
Nick Mathewson
5d219ecf98
Update Longclaw's IP address; fixes 23592.
2017-10-17 14:00:30 -04:00
Nick Mathewson
b9b5f9a1a5
Merge branch 'maint-0.3.2'
2017-10-17 13:58:25 -04:00
Nick Mathewson
9298749088
Add dirauth changes as a lintchanges category
2017-10-17 13:58:21 -04:00
Nick Mathewson
d8604b8729
Merge branch 'teor_bug23813_squashed'
2017-10-15 20:36:23 -04:00
teor
eaf9c0f25a
Describe what router_reset_descriptor_download_failures() actually does
...
Comment-only change.
Part of #23813 .
2017-10-15 20:36:18 -04:00
Nick Mathewson
e00f12ec6c
bump version on master to 0.3.3.0-alpha-dev
2017-10-15 11:57:06 -04:00
Nick Mathewson
22139c0b28
Merge remote-tracking branch 'catalyst-oniongit/bug23757'
2017-10-10 14:09:49 -04:00
Nick Mathewson
d9321d697d
Merge remote-tracking branch 'catalyst-oniongit/bug23755'
2017-10-10 14:07:34 -04:00
Taylor Yu
3ae5b32aaa
Match .travis.yml more closely
...
Adjust the GitLab CI configuration to more closely match that of
Travis CI. Fixes bug 23757.
2017-10-05 22:42:00 -05:00
Taylor Yu
d5d811e2d0
Only run "update" job from scheduled pipelines
...
Stop attempting to unconditionally mirror the tor repository in GitLab
CI. This prevented developers from enabling GitLab CI on master
because the "update" job would attempt to run, causing an unuseful CI
failure. Fixes bug 23755.
2017-10-05 13:37:57 -05:00
Nick Mathewson
91c17ffbd6
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:04:59 -04:00
Nick Mathewson
7a4741c233
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-05 11:04:59 -04:00
Nick Mathewson
f7f55acae9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:04:59 -04:00
Nick Mathewson
43ebe54a24
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:04:59 -04:00
Nick Mathewson
51e47481fc
Merge branch 'maint-0.3.1'
2017-10-05 11:04:59 -04:00
Nick Mathewson
2e21493a88
add missing subcategory in changes file
2017-10-05 11:04:54 -04:00
Nick Mathewson
bdf60fc7ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-05 11:03:36 -04:00
Nick Mathewson
0cd7c1af37
Merge branch 'maint-0.3.1'
2017-10-05 11:03:36 -04:00
Nick Mathewson
d6bdec1595
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:03:35 -04:00
Nick Mathewson
ad7db10770
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:03:35 -04:00
Nick Mathewson
2984d99165
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:03:35 -04:00
Karsten Loesing
b9d9b16b76
Update geoip and geoip6 to the October 4 2017 database.
2017-10-05 16:56:14 +02:00
Taylor Yu
44e4a96bb5
Don't expect permission failure if running as root
...
Skip test_config_include_no_permission() when running as root, because
it will get an unexpected success from config_get_lines_include().
This affects some continuous integration setups. Fixes bug 23758.
2017-10-04 08:42:05 -05:00
Nick Mathewson
55e5446f8d
note cathugger in changes file for 23748
2017-10-04 09:01:59 -04:00
cathugger
9d90f9829c
hs-v3: Always generate the public key file on disk
...
Fixes #23748
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03 11:19:10 -04:00
Nick Mathewson
1e7e36da4b
Merge branch 'bug23672_032_01_squashed'
2017-10-03 10:56:52 -04:00
