e5cf65e8ea
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-18 11:03:16 -05:00
53c3174ee4
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-18 11:01:43 -05:00
d388f9d879
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-18 11:01:33 -05:00
9f2efd02a1
Minimal implementation of bridge-distribution-request
...
Just advertise the line when we're a bridge, using "any" if we're
published or "none" if we aren't.
This is done in lieu of a full backport of #18329 .
2017-11-13 20:44:51 -05:00
b84815881f
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 20:36:04 -05:00
1b9bb2c847
Merge branch 'bug22895_027' into maint-0.2.9
2017-11-13 20:35:59 -05:00
dbb9ec494f
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 12:57:58 -05:00
543fd89fb7
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-13 12:57:58 -05:00
800797e7f3
Merge branch 'bug23291_028' into maint-0.2.8
2017-11-13 12:57:55 -05:00
97c3fac6d4
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 11:18:02 -05:00
ab415ae950
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
2017-11-13 11:17:58 -05:00
420e8737b4
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 11:15:50 -05:00
666653758d
Merge branch 'bug8185_025' into maint-0.2.9
2017-11-13 11:15:47 -05:00
15179a3e01
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 11:13:22 -05:00
c928fb988a
Merge branch 'ticket21953_029' into maint-0.2.9
2017-11-13 11:13:18 -05:00
c9b76a12f5
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-11 12:23:33 -05:00
c24b90e3ac
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-11 12:23:33 -05:00
9666c620d5
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-11 12:23:33 -05:00
6f8c32b7de
Update geoip and geoip6 to the November 6 2017 database.
2017-11-10 10:14:09 +01:00
fecc5c61fc
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-31 11:43:14 -04:00
04d4786cc4
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
2017-10-31 11:43:07 -04:00
3353942fde
start a changelog for 0.2.9.13
2017-10-24 08:56:43 -04:00
4dad6123cf
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-23 15:53:50 -04:00
b1bd1bf19f
Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
2017-10-23 15:53:45 -04:00
d65016c0bb
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-23 09:06:34 -04:00
1db5081ba1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 09:06:34 -04:00
8cc147aa83
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 09:04:56 -04:00
15a699462d
dirauth: Add bastet to the default authorities
...
Fixes #23910
Based on a patch by dgoulet; backported to 0.2.5
2017-10-23 09:03:36 -04:00
b1445b19e4
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-23 08:59:11 -04:00
c958fda6e2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:59:11 -04:00
9a1b385462
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 08:58:28 -04:00
d818f1e86d
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-23 08:53:25 -04:00
132e2f69b1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:53:25 -04:00
6f87a85897
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
2017-10-23 08:53:14 -04:00
94f478c84a
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-23 08:47:58 -04:00
fcaf3335b4
Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9
2017-10-23 08:47:52 -04:00
3bf1d81a1d
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-23 08:46:29 -04:00
68dea082e7
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
2017-10-23 08:46:26 -04:00
5d219ecf98
Update Longclaw's IP address; fixes 23592.
2017-10-17 14:00:30 -04:00
5bca66be49
Clear the address when node_get_prim_orport() returns early
...
Fixes bug 23874; bugfix on 0.2.8.2-alpha.
2017-10-15 16:48:36 -04:00
91c17ffbd6
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:04:59 -04:00
4b6ba09674
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-05 11:04:59 -04:00
43ebe54a24
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:04:59 -04:00
2e21493a88
add missing subcategory in changes file
2017-10-05 11:04:54 -04:00
d6bdec1595
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:03:35 -04:00
5d516315f5
Merge branch 'maint-0.2.9' into release-0.2.9
2017-10-05 11:03:35 -04:00
2984d99165
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:03:35 -04:00
b9d9b16b76
Update geoip and geoip6 to the October 4 2017 database.
2017-10-05 16:56:14 +02:00
c50c98ba6a
Make changes in server_mode() affect workers; fix a crash.
...
Without this fix, changes from client to bridge don't trigger
transition_affects_workers(), so we would never have actually
initialized the cpuworkers.
Fixes bug 23693. Bugfix on 3bcdb26267
2017-10-02 11:11:30 -04:00
f7222e6d8c
Clear outbuf_flushlen when we clear a connection's outbuf
...
When we added single_conn_free_bytes(), we cleared the outbuf on a
connection without setting outbuf_flushlen() to 0. This could cause
an assertion failure later on in flush_buf().
Fixes bug 23690; bugfix on 0.2.6.1-alpha.
2017-09-29 10:00:14 -04:00
Nick Mathewson
Karsten Loesing
David Goulet
teor