Nick Mathewson 698629f5a9 Merge remote-tracking branch 'tor-github/pr/404'

2018-10-16 17:29:50 -04:00

..

app

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

2018-10-12 11:39:37 -04:00

config

Merge branch 'maint-0.3.3' into maint-0.3.4

2018-10-10 11:34:49 -04:00

core

Write a comment to explain may_need_rebind condition

2018-10-15 16:18:31 +03: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.4'

2018-10-15 12:52:54 -04:00

lib

Merge remote-tracking branch 'public/bug27990'

2018-10-16 08:02:01 -04:00

rust

Merge branch 'maint-0.3.4'

2018-09-18 08:33:13 -04:00

test

Merge branch 'maint-0.3.4'

2018-10-16 08:04:34 -04: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.2-alpha-dev

2018-09-21 09:11:33 -04:00

include.am

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

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