summaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2009-07-25 11:15:42 +0200
committerPeter Palfrader <peter@palfrader.org>2009-07-25 11:15:42 +0200
commitf39cee375472a6e3a4f0decb7e2f91c5768a2165 (patch)
tree28772c7d359ebbd534624a98c526d2ed4b0ac16f /src/or/relay.c
parent95a662364544afc741dc2b203f939bd5a2f126fd (diff)
parent805b19e4f138d3610ae8a2ab07b490413da450de (diff)
downloadtor-f39cee375472a6e3a4f0decb7e2f91c5768a2165.tar.gz
tor-f39cee375472a6e3a4f0decb7e2f91c5768a2165.zip
Merge branch 'debian-merge' into debian
* debian-merge: New upstream version bump to 0.2.1.18 put in the full 0.2.1 release notes add a changelog entry for the upcoming 0.2.1.18 make phobos's lines start with tabs again added LIBS=-lrt to Makefile.am for static libevent in the tor rpms. forward-port the 0.2.0.35 release notes add blurbs for recent release candidates Bump version to 0.2.1.17-rc-dev
Diffstat (limited to 'src/or/relay.c')
0 files changed, 0 insertions, 0 deletions