Nick Mathewson 6851a08090 Merge branch 'ticket28115_035' into maint-0.3.5

2018-10-24 10:20:41 -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

Merge branch 'maint-0.3.4'

2018-10-17 13:02:23 -04:00

ext

Merge branch 'maint-0.2.9' into maint-0.3.2

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

feature

Merge branch 'bug27800-034' into bug27800-035

2018-10-17 16:00:11 -05:00

lib

Rename a function; it is used to convert a value _From_ le.

2018-10-19 08:42:28 -04:00

rust

rust/tor_log: fix C_RUST_COUPLED documentation

2018-10-24 09:02:04 -04:00

test

Merge branch 'maint-0.3.4' into maint-0.3.5

2018-10-23 19:21:44 -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.3-alpha-dev

2018-10-17 14:46:00 -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