Nick Mathewson 8e3bae566a Merge branch 'maint-0.3.5'

2018-11-07 16:27:26 -05:00

..

app

Merge branch 'ticket27225_squashed'

2018-11-07 10:47:29 -05:00

config

Fix the missing unpack function in mmdb-convert.py

2018-10-10 14:12:53 -07:00

core

Merge remote-tracking branch 'tor-github/pr/271'

2018-11-07 11:21:13 -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 'maint-0.3.5'

2018-11-07 16:27:26 -05:00

lib

simplify now that it uses tor's copyright and license

2018-11-07 11:02:26 -05:00

rust

Merge remote-tracking branch 'tor-github/pr/466'

2018-11-06 15:35:45 -05:00

test

Merge remote-tracking branch 'tor-github/pr/271'

2018-11-07 11:21:13 -05:00

tools

Add a tor_free() in tor_gencert to fix a coverity warning

2018-10-16 17:18:46 -04: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.4-alpha

2018-11-07 14:40:26 -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