user/sebastian/tor, branch bastet_v6

Add bastet's ipv6 address

2017-11-23T06:41:56+00:00

Implements ticket 24394

Merge branch 'maint-0.2.8' into maint-0.2.9

2017-11-18T16:01:43+00:00

Merge branch 'maint-0.2.5' into maint-0.2.8

2017-11-18T16:01:33+00:00

Merge branch 'ticket18329_minimal_025' into maint-0.2.5

2017-11-18T16:00:45+00:00

Minimal implementation of bridge-distribution-request

2017-11-14T01:44:51+00:00

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.

Merge branch 'bug22895_027' into maint-0.2.9

2017-11-14T01:35:59+00:00

Merge branch 'maint-0.2.8' into maint-0.2.9

2017-11-13T17:57:58+00:00

Merge branch 'bug23291_028' into maint-0.2.8

2017-11-13T17:57:55+00:00

Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9

2017-11-13T16:17:58+00:00

Merge branch 'bug8185_025' into maint-0.2.9

2017-11-13T16:15:47+00:00