Nick Mathewson d6f77b99da Merge branch 'maint-0.3.4' into maint-0.3.5

2019-03-06 14:29:38 -05:00

..

app

Merge branch 'ticket29040_1_changes' into maint-0.3.5

2019-02-08 08:37:43 -05:00

config

Merge branch 'maint-0.3.4' into maint-0.3.5

2019-03-06 14:29:38 -05:00

core

Merge branch 'maint-0.3.4' into maint-0.3.5

2019-02-21 10:08:14 -05:00

ext

Bump copyright date to 2019.

2019-01-16 12:32:32 -05:00

feature

Merge branch 'tor-github/pr/536' into maint-0.3.5

2019-02-14 17:39:34 +02:00

lib

Merge branch 'tor-github/pr/689' into maint-0.3.5

2019-02-14 18:00:05 +02:00

rust

Merge branch 'maint-0.3.4' into maint-0.3.5

2019-02-05 08:10:14 -05:00

test

Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9

2019-03-01 14:14:51 +10:00

tools

Bump copyright date to 2019.

2019-01-16 12:32:32 -05:00

trunnel

Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged

2018-07-12 11:47:25 -04:00

win32

Bump to 0.3.5.8-dev

2019-02-21 13:24:42 -05:00

include.am

Extract the non-stats part of geoip into a new src/lib/geoip.

2018-09-27 10:26:01 -04:00