now that libevent has a stable 1.4 release out with the features & fixes we wanted, aim third-party/libevent/ at libevent's 1.4 maintainance branch instead of their trunk.

libtransmission/ratecontrol.c

@@ -30,8 +30,8 @@
 #include "utils.h"
 
 #define GRANULARITY_MSEC 250
-#define SHORT_INTERVAL_MSEC 3000
-#define LONG_INTERVAL_MSEC 6000
+#define SHORT_INTERVAL_MSEC 4000
+#define LONG_INTERVAL_MSEC 8000
 #define HISTORY_SIZE (LONG_INTERVAL_MSEC / GRANULARITY_MSEC)
 
 struct tr_transfer

libtransmission/transmission.h

@@ -129,12 +129,11 @@ typedef struct tr_session_stats
 }
 tr_session_stats;
 
-/* stats accumulated across all the times that Transmission's been used. */
+/* stats from the current and past sessions. */
 void tr_getCumulativeSessionStats( const tr_handle   * handle,
                                    tr_session_stats  * setme );
 
-/* stats accumulated during this current session.
-   'sessionCount' is pretty useless here, eh? :) */
+/* stats from the current session. */
 void tr_getSessionStats( const tr_handle   * handle,
                          tr_session_stats  * setme );
 

libtransmission/utils.h

@@ -42,8 +42,6 @@ char* tr_getLogTimeStr( char * buf, int buflen );
 
 int  tr_rand ( int );
 
-int tr_asprintf(char **strp, const char *fmt, ...);
-
 int tr_mkdirp( const char * path, int permissions );
 
 int tr_mkdir( const char * path, int permissions );