Nick Mathewson 85c5f58509 Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-07 08:43:46 -05:00

..

app

Merge branch 'bug28612_squashed' into maint-0.3.5

2018-12-18 13:55:57 -05:00

config

Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-07 08:43:46 -05:00

core

Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-03 09:02:39 -05:00

ext

Merge branch 'maint-0.2.9' into maint-0.3.2

2018-09-13 11:46:04 -04:00

feature

Merge branch 'ticket28879' into maint-0.3.5

2019-01-03 21:34:35 -05:00

lib

Merge branch 'ticket28851_035_squashed' into maint-0.3.5

2019-01-03 09:45:53 -05:00

rust

Merge branch 'bug27740_035_fix' into maint-0.3.5

2018-11-15 16:11:06 -05:00

test

Merge branch 'ticket28883_035' into maint-0.3.5

2018-12-19 15:36:03 -05:00

tools

Add missing library to build tor-print-ed-signing-cert.

2018-11-19 10:18:44 -05:00

trunnel

Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged

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

win32

Bump version to 0.3.5.6-rc-dev

2018-12-18 13:33:49 -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