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

2018-12-06 09:26:33 -05:00

..

app

Merge remote-tracking branch 'tor-github/pr/484' into maint-0.3.5

2018-11-06 15:19:04 -05:00

config

Merge branch 'maint-0.3.4' into maint-0.3.5

2018-12-06 09:26:33 -05:00

core

Merge remote-tracking branch 'dgoulet/ticket27471_035_02' into maint-0.3.5

2018-11-16 08:57:56 -05:00

ext

Merge branch 'maint-0.2.9' into maint-0.3.2

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

feature

Merge remote-tracking branch 'tor-github/pr/546' into maint-0.3.5

2018-12-05 10:23:28 -05:00

lib

Merge branch 'bug28096-029-squashed' into bug28096-035-squashed

2018-11-15 12:23:29 +10:00

rust

Merge branch 'bug27740_035_fix' into maint-0.3.5

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

test

Also log a Tor log entry when it has a substring we are waiting for

2018-12-01 11:18: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 to 0.3.5.5-alpha-dev

2018-11-16 11:32:04 -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